Mercurial > hg
comparison hgext/mq.py @ 14319:b33f3e35efb0
scmutil: move revsingle/pair/range from cmdutil
This allows users at levels below the command layer to avoid import loops.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 13 May 2011 14:06:28 -0500 |
parents | 21719639276d |
children | a90131b85fd8 |
comparison
equal
deleted
inserted
replaced
14318:1f46be4689ed | 14319:b33f3e35efb0 |
---|---|
44 | 44 |
45 from mercurial.i18n import _ | 45 from mercurial.i18n import _ |
46 from mercurial.node import bin, hex, short, nullid, nullrev | 46 from mercurial.node import bin, hex, short, nullid, nullrev |
47 from mercurial.lock import release | 47 from mercurial.lock import release |
48 from mercurial import commands, cmdutil, hg, scmutil, util, revset | 48 from mercurial import commands, cmdutil, hg, scmutil, util, revset |
49 from mercurial import repair, extensions, url, error | 49 from mercurial import repair, extensions, url, error, scmutil |
50 from mercurial import patch as patchmod | 50 from mercurial import patch as patchmod |
51 import os, sys, re, errno, shutil | 51 import os, sys, re, errno, shutil |
52 | 52 |
53 commands.norepo += " qclone" | 53 commands.norepo += " qclone" |
54 | 54 |
813 | 813 |
814 numrevs = 0 | 814 numrevs = 0 |
815 if opts.get('rev'): | 815 if opts.get('rev'): |
816 if not self.applied: | 816 if not self.applied: |
817 raise util.Abort(_('no patches applied')) | 817 raise util.Abort(_('no patches applied')) |
818 revs = cmdutil.revrange(repo, opts.get('rev')) | 818 revs = scmutil.revrange(repo, opts.get('rev')) |
819 if len(revs) > 1 and revs[0] > revs[1]: | 819 if len(revs) > 1 and revs[0] > revs[1]: |
820 revs.reverse() | 820 revs.reverse() |
821 revpatches = self._revpatches(repo, revs) | 821 revpatches = self._revpatches(repo, revs) |
822 realpatches += revpatches | 822 realpatches += revpatches |
823 numrevs = len(revpatches) | 823 numrevs = len(revpatches) |
1746 | 1746 |
1747 if rev: | 1747 if rev: |
1748 if files: | 1748 if files: |
1749 raise util.Abort(_('option "-r" not valid when importing ' | 1749 raise util.Abort(_('option "-r" not valid when importing ' |
1750 'files')) | 1750 'files')) |
1751 rev = cmdutil.revrange(repo, rev) | 1751 rev = scmutil.revrange(repo, rev) |
1752 rev.sort(reverse=True) | 1752 rev.sort(reverse=True) |
1753 if (len(files) > 1 or len(rev) > 1) and patchname: | 1753 if (len(files) > 1 or len(rev) > 1) and patchname: |
1754 raise util.Abort(_('option "-n" not valid when importing multiple ' | 1754 raise util.Abort(_('option "-n" not valid when importing multiple ' |
1755 'patches')) | 1755 'patches')) |
1756 if rev: | 1756 if rev: |
2734 backup = 'strip' | 2734 backup = 'strip' |
2735 elif opts.get('no_backup') or opts.get('nobackup'): | 2735 elif opts.get('no_backup') or opts.get('nobackup'): |
2736 backup = 'none' | 2736 backup = 'none' |
2737 | 2737 |
2738 cl = repo.changelog | 2738 cl = repo.changelog |
2739 revs = set(cmdutil.revrange(repo, revs)) | 2739 revs = set(scmutil.revrange(repo, revs)) |
2740 if not revs: | 2740 if not revs: |
2741 raise util.Abort(_('empty revision set')) | 2741 raise util.Abort(_('empty revision set')) |
2742 | 2742 |
2743 descendants = set(cl.descendants(*revs)) | 2743 descendants = set(cl.descendants(*revs)) |
2744 strippedrevs = revs.union(descendants) | 2744 strippedrevs = revs.union(descendants) |
2926 q = repo.mq | 2926 q = repo.mq |
2927 if not q.applied: | 2927 if not q.applied: |
2928 ui.status(_('no patches applied\n')) | 2928 ui.status(_('no patches applied\n')) |
2929 return 0 | 2929 return 0 |
2930 | 2930 |
2931 revs = cmdutil.revrange(repo, revrange) | 2931 revs = scmutil.revrange(repo, revrange) |
2932 q.finish(repo, revs) | 2932 q.finish(repo, revs) |
2933 q.save_dirty() | 2933 q.save_dirty() |
2934 return 0 | 2934 return 0 |
2935 | 2935 |
2936 @command("qqueue", | 2936 @command("qqueue", |