Issue #2397 duplicate

Error in qimport/qpop/qpush sequence

agalanin
created an issue

Actions:

  1. open the repository using 'thg log'.

  2. make changes and create changeset

  3. select changeset from p.2 and import it to MQ

  4. un-apply patch

  5. select patch and apply it

  6. close thg

  7. un-apply patch using 'hg qpop' command

  8. open thg log

  9. apply the patch via gui

Result:

1-4. ok

[5] ERROR: patch not applied

6-8. ok

[9] OK, patch is applied

Comments (11)

  1. agalanin reporter

    $ thg version TortoiseHg Dialogs (version 2.4), Mercurial (version 2.2.2)

    Copyright (C) 2008-2012 Steve Borho steve@borho.org and others. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

  2. agalanin reporter

    Is there any commands that I can run to provide more logs?

    Output log (-v in qgoto command added by me by hacking /usr/lib/python2.6/dist-packages/tortoisehg/hgqt/mq.py):

    % hg commit --repository /home/al/tmp/reponame --verbose --user Alexander Galanin <al@galanin.nnov.ru> --message=Commit message -- /home/al/tmp/reponame/filename.ext
    filename.ext
    committed changeset 181:430029dd754c
    [command completed successfully Sat Feb  2 16:00:47 2013]
    % hg qimport --rev 181:: --repository /home/al/tmp/reponame
    [command completed successfully Sat Feb  2 16:00:53 2013]
    % hg qpop --all --repository /home/al/tmp/reponame
    popping 181.diff
    patch queue now empty
    [command completed successfully Sat Feb  2 16:00:56 2013]
    % hg qgoto -R /home/al/tmp/reponame -v -- 181.diff
    applying 181.diff
    maximum recursion depth exceeded
    patch failed, rejects left in working dir
    errors during apply, please fix and refresh 181.diff
    [command returned code 2 Sat Feb  2 16:00:58 2013]
    reponame%
    

    Patch content:

    # HG changeset patch
    # User Alexander Galanin <al@galanin.nnov.ru>
    # Date 1359806714 -14400
    # Node ID 9eb8cf2fa9b7eff3bcaa1d297667cd1b945b6bbb
    # Parent  eed09f4b7123e41efcd20375d36a0b35dede7812
    Commit message
    
    diff -r eed09f4b7123 -r 9eb8cf2fa9b7 filename.ext
    --- a/filename.ext Thu Jan 31 18:08:26 2013 +0400
    +++ b/filename.ext Sat Feb 02 16:05:14 2013 +0400
    @@ -2,7 +2,6 @@
    
     module a
     module b
    -#module c
     module d
     module e
    
  3. Yuya Nishihara

    maximum recursion depth exceeded

    This is the cause of qpush failure. Try to disable extensions one by one until this error disappears.

    Also, you can get more detail by $ THGDEBUG=1 thg --nofork.

  4. agalanin reporter

    The problem disappeared after disabling 'keyword' extension.

    Full list of enabled extensions:

    [extensions]
    hgext.graphlog=
    hgext.hgk=
    hgext.keyword=
    hgext.convert=
    hgext.extdiff=
    hgext.mq=
    hgext.color=
    
  5. Log in to comment