Extension to reorder mq patches

Wolfgang Treutterer Wolfgang.Treutterer at ipp.mpg.de
Thu May 29 16:33:17 UTC 2008


Thank you very much for your qup and qtimes extensions. Especially 
qtimes is very useful for me.

When I tried to run hg qup with a repository on NFS, however, I got the 
following error:

    xxx at yyy 56) hg qpop -a
    Patch queue now empty
    0.94user 0.41sys 0:02.10 64.2%
    xxx at yyy 57) ls .hg/patches
    avail distpow  heatmod  remprotmod  series  status
    wot at sfssr6 58) hg qup avail
    xxx at yyy Cross-device link
==>        ^ this refuses to rename a file to another device
==>          (qup creates a new series file on /tmp and finally
==>           tries to rename it to the original series file)
    xxx at yyy 59) ls .hg/patches
    avail  distpow  heatmod  remprotmod  status
==>                                    ^ series file missing


The following patch to qup.py fixes qup to copy the newly composed 
series file over the original one, instead of renaming it :

11c11
< import os, tempfile
---
 > import os, tempfile, shutil
82,83c82,83
<     os.remove(series.name)
<     os.rename(outfile.name, series.name)
---
 >     shutil.copy2(outfile.name, series.name)
 >     os.remove(outfile.name)

I would be glad, if the issue could be fixed by this, or another patch.


Wolfgang




More information about the Mercurial mailing list