Mercurial > hg > gitserve
annotate hgext/mq.py @ 3189:0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
This moves most of the queue display code into qseries.
| author | Brendan Cully <brendan@kublai.com> |
|---|---|
| date | Wed, 27 Sep 2006 13:34:20 -0700 |
| parents | e21337e06952 |
| children | 87b7ae306d54 |
| rev | line source |
|---|---|
| 1808 | 1 # queue.py - patch queues for mercurial |
| 2 # | |
| 2865 | 3 # Copyright 2005, 2006 Chris Mason <mason@suse.com> |
| 1808 | 4 # |
| 5 # This software may be used and distributed according to the terms | |
| 6 # of the GNU General Public License, incorporated herein by reference. | |
| 7 | |
|
2554
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
8 '''patch management and development |
|
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
9 |
|
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
10 This extension lets you work with a stack of patches in a Mercurial |
|
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
11 repository. It manages two stacks of patches - all known patches, and |
|
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
12 applied patches (subset of known patches). |
|
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
13 |
|
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
14 Known patches are represented as patch files in the .hg/patches |
|
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
15 directory. Applied patches are both patch files and changesets. |
|
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
16 |
|
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
17 Common tasks (use "hg help command" for more details): |
|
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
18 |
|
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
19 prepare repository to work with patches qinit |
|
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
20 create new patch qnew |
|
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
21 import existing patch qimport |
|
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
22 |
|
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
23 print patch series qseries |
|
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
24 print applied patches qapplied |
|
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
25 print name of top applied patch qtop |
|
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
26 |
|
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
27 add known patch to applied stack qpush |
|
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
28 remove patch from applied stack qpop |
|
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
29 refresh contents of top applied patch qrefresh |
|
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
30 ''' |
|
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
31 |
| 1808 | 32 from mercurial.demandload import * |
| 2873 | 33 from mercurial.i18n import gettext as _ |
|
2990
a9d7a43fb3f0
mq: fix bad interaction between demandload and update of commands.norepo
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2947
diff
changeset
|
34 from mercurial import commands |
| 1808 | 35 demandload(globals(), "os sys re struct traceback errno bz2") |
|
2990
a9d7a43fb3f0
mq: fix bad interaction between demandload and update of commands.norepo
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2947
diff
changeset
|
36 demandload(globals(), "mercurial:cmdutil,hg,patch,revlog,ui,util") |
| 1808 | 37 |
|
2720
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2713
diff
changeset
|
38 commands.norepo += " qclone qversion" |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2713
diff
changeset
|
39 |
|
2818
bdc067ff6cf5
Make mq camelcase consistent with the rest of hg.
Brendan Cully <brendan@kublai.com>
parents:
2816
diff
changeset
|
40 class statusentry: |
|
2780
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
41 def __init__(self, rev, name=None): |
|
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
42 if not name: |
|
3097
7fa3d38a99b6
mq: handle patch names containing ":"
Brendan Cully <brendan@kublai.com>
parents:
3094
diff
changeset
|
43 fields = rev.split(':', 1) |
|
2816
52516e48e3f3
Update qsave to use StatusEntry; don't throw exception on bad status lines.
Brendan Cully <brendan@kublai.com>
parents:
2804
diff
changeset
|
44 if len(fields) == 2: |
|
52516e48e3f3
Update qsave to use StatusEntry; don't throw exception on bad status lines.
Brendan Cully <brendan@kublai.com>
parents:
2804
diff
changeset
|
45 self.rev, self.name = fields |
|
52516e48e3f3
Update qsave to use StatusEntry; don't throw exception on bad status lines.
Brendan Cully <brendan@kublai.com>
parents:
2804
diff
changeset
|
46 else: |
|
52516e48e3f3
Update qsave to use StatusEntry; don't throw exception on bad status lines.
Brendan Cully <brendan@kublai.com>
parents:
2804
diff
changeset
|
47 self.rev, self.name = None, None |
|
2780
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
48 else: |
|
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
49 self.rev, self.name = rev, name |
|
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
50 |
|
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
51 def __str__(self): |
|
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
52 return self.rev + ':' + self.name |
|
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
53 |
| 1808 | 54 class queue: |
| 55 def __init__(self, ui, path, patchdir=None): | |
| 56 self.basepath = path | |
| 2819 | 57 self.path = patchdir or os.path.join(path, "patches") |
|
1852
fdf9cbf56ec7
Fix mq's usage of opener, which don't allow absolute paths now.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1839
diff
changeset
|
58 self.opener = util.opener(self.path) |
| 1808 | 59 self.ui = ui |
| 60 self.applied = [] | |
| 61 self.full_series = [] | |
| 62 self.applied_dirty = 0 | |
| 63 self.series_dirty = 0 | |
|
1852
fdf9cbf56ec7
Fix mq's usage of opener, which don't allow absolute paths now.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1839
diff
changeset
|
64 self.series_path = "series" |
|
fdf9cbf56ec7
Fix mq's usage of opener, which don't allow absolute paths now.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1839
diff
changeset
|
65 self.status_path = "status" |
|
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
66 self.guards_path = "guards" |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
67 self.active_guards = None |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
68 self.guards_dirty = False |
|
2880
4ec58b157265
refactor text diff/patch code.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2879
diff
changeset
|
69 self._diffopts = None |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
70 |
| 2819 | 71 if os.path.exists(self.join(self.series_path)): |
|
1852
fdf9cbf56ec7
Fix mq's usage of opener, which don't allow absolute paths now.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1839
diff
changeset
|
72 self.full_series = self.opener(self.series_path).read().splitlines() |
|
2767
60683ab1ed33
mq: rename read_series as parse_series, make simpler and faster
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2766
diff
changeset
|
73 self.parse_series() |
| 1808 | 74 |
| 2819 | 75 if os.path.exists(self.join(self.status_path)): |
|
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
76 lines = self.opener(self.status_path).read().splitlines() |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
77 self.applied = [statusentry(l) for l in lines] |
| 1808 | 78 |
|
2880
4ec58b157265
refactor text diff/patch code.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2879
diff
changeset
|
79 def diffopts(self): |
|
4ec58b157265
refactor text diff/patch code.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2879
diff
changeset
|
80 if self._diffopts is None: |
|
2894
3848488244fc
Move ui.diffopts to patch.diffopts where it belongs
Matt Mackall <mpm@selenic.com>
parents:
2889
diff
changeset
|
81 self._diffopts = patch.diffopts(self.ui) |
|
2880
4ec58b157265
refactor text diff/patch code.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2879
diff
changeset
|
82 return self._diffopts |
|
4ec58b157265
refactor text diff/patch code.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2879
diff
changeset
|
83 |
| 2819 | 84 def join(self, *p): |
| 85 return os.path.join(self.path, *p) | |
| 86 | |
| 1808 | 87 def find_series(self, patch): |
| 88 pre = re.compile("(\s*)([^#]+)") | |
| 89 index = 0 | |
| 90 for l in self.full_series: | |
| 91 m = pre.match(l) | |
| 92 if m: | |
| 93 s = m.group(2) | |
| 94 s = s.rstrip() | |
| 95 if s == patch: | |
| 96 return index | |
| 97 index += 1 | |
| 98 return None | |
| 99 | |
|
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
100 guard_re = re.compile(r'\s?#([-+][^-+# \t\r\n\f][^# \t\r\n\f]*)') |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
101 |
|
2767
60683ab1ed33
mq: rename read_series as parse_series, make simpler and faster
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2766
diff
changeset
|
102 def parse_series(self): |
| 1808 | 103 self.series = [] |
|
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
104 self.series_guards = [] |
|
2767
60683ab1ed33
mq: rename read_series as parse_series, make simpler and faster
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2766
diff
changeset
|
105 for l in self.full_series: |
|
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
106 h = l.find('#') |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
107 if h == -1: |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
108 patch = l |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
109 comment = '' |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
110 elif h == 0: |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
111 continue |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
112 else: |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
113 patch = l[:h] |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
114 comment = l[h:] |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
115 patch = patch.strip() |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
116 if patch: |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
117 self.series.append(patch) |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
118 self.series_guards.append(self.guard_re.findall(comment)) |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
119 |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
120 def check_guard(self, guard): |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
121 bad_chars = '# \t\r\n\f' |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
122 first = guard[0] |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
123 for c in '-+': |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
124 if first == c: |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
125 return (_('guard %r starts with invalid character: %r') % |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
126 (guard, c)) |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
127 for c in bad_chars: |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
128 if c in guard: |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
129 return _('invalid character in guard %r: %r') % (guard, c) |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
130 |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
131 def set_active(self, guards): |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
132 for guard in guards: |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
133 bad = self.check_guard(guard) |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
134 if bad: |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
135 raise util.Abort(bad) |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
136 guards = dict.fromkeys(guards).keys() |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
137 guards.sort() |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
138 self.ui.debug('active guards: %s\n' % ' '.join(guards)) |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
139 self.active_guards = guards |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
140 self.guards_dirty = True |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
141 |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
142 def active(self): |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
143 if self.active_guards is None: |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
144 self.active_guards = [] |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
145 try: |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
146 guards = self.opener(self.guards_path).read().split() |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
147 except IOError, err: |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
148 if err.errno != errno.ENOENT: raise |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
149 guards = [] |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
150 for i, guard in enumerate(guards): |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
151 bad = self.check_guard(guard) |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
152 if bad: |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
153 self.ui.warn('%s:%d: %s\n' % |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
154 (self.join(self.guards_path), i + 1, bad)) |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
155 else: |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
156 self.active_guards.append(guard) |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
157 return self.active_guards |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
158 |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
159 def set_guards(self, idx, guards): |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
160 for g in guards: |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
161 if len(g) < 2: |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
162 raise util.Abort(_('guard %r too short') % g) |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
163 if g[0] not in '-+': |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
164 raise util.Abort(_('guard %r starts with invalid char') % g) |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
165 bad = self.check_guard(g[1:]) |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
166 if bad: |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
167 raise util.Abort(bad) |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
168 drop = self.guard_re.sub('', self.full_series[idx]) |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
169 self.full_series[idx] = drop + ''.join([' #' + g for g in guards]) |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
170 self.parse_series() |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
171 self.series_dirty = True |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
172 |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
173 def pushable(self, idx): |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
174 if isinstance(idx, str): |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
175 idx = self.series.index(idx) |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
176 patchguards = self.series_guards[idx] |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
177 if not patchguards: |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
178 return True, None |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
179 default = False |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
180 guards = self.active() |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
181 exactneg = [g for g in patchguards if g[0] == '-' and g[1:] in guards] |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
182 if exactneg: |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
183 return False, exactneg[0] |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
184 pos = [g for g in patchguards if g[0] == '+'] |
|
2856
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2854
diff
changeset
|
185 exactpos = [g for g in pos if g[1:] in guards] |
|
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
186 if pos: |
|
2856
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2854
diff
changeset
|
187 if exactpos: |
|
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2854
diff
changeset
|
188 return True, exactpos[0] |
|
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2854
diff
changeset
|
189 return False, pos |
|
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
190 return True, '' |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
191 |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
192 def explain_pushable(self, idx, all_patches=False): |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
193 write = all_patches and self.ui.write or self.ui.warn |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
194 if all_patches or self.ui.verbose: |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
195 if isinstance(idx, str): |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
196 idx = self.series.index(idx) |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
197 pushable, why = self.pushable(idx) |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
198 if all_patches and pushable: |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
199 if why is None: |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
200 write(_('allowing %s - no guards in effect\n') % |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
201 self.series[idx]) |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
202 else: |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
203 if not why: |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
204 write(_('allowing %s - no matching negative guards\n') % |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
205 self.series[idx]) |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
206 else: |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
207 write(_('allowing %s - guarded by %r\n') % |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
208 (self.series[idx], why)) |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
209 if not pushable: |
|
2829
05316bb57d01
mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2828
diff
changeset
|
210 if why: |
|
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
211 write(_('skipping %s - guarded by %r\n') % |
|
2829
05316bb57d01
mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2828
diff
changeset
|
212 (self.series[idx], ' '.join(why))) |
|
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
213 else: |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
214 write(_('skipping %s - no matching guards\n') % |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
215 self.series[idx]) |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
216 |
| 1808 | 217 def save_dirty(self): |
|
2772
4720e79486d3
mq: simplify save_dirty
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2771
diff
changeset
|
218 def write_list(items, path): |
|
4720e79486d3
mq: simplify save_dirty
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2771
diff
changeset
|
219 fp = self.opener(path, 'w') |
|
4720e79486d3
mq: simplify save_dirty
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2771
diff
changeset
|
220 for i in items: |
|
4720e79486d3
mq: simplify save_dirty
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2771
diff
changeset
|
221 print >> fp, i |
|
4720e79486d3
mq: simplify save_dirty
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2771
diff
changeset
|
222 fp.close() |
| 2781 | 223 if self.applied_dirty: write_list(map(str, self.applied), self.status_path) |
|
2772
4720e79486d3
mq: simplify save_dirty
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2771
diff
changeset
|
224 if self.series_dirty: write_list(self.full_series, self.series_path) |
|
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
225 if self.guards_dirty: write_list(self.active_guards, self.guards_path) |
| 1808 | 226 |
| 227 def readheaders(self, patch): | |
| 228 def eatdiff(lines): | |
| 229 while lines: | |
| 230 l = lines[-1] | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
231 if (l.startswith("diff -") or |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
232 l.startswith("Index:") or |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
233 l.startswith("===========")): |
| 1808 | 234 del lines[-1] |
| 235 else: | |
| 236 break | |
| 237 def eatempty(lines): | |
| 238 while lines: | |
| 239 l = lines[-1] | |
| 240 if re.match('\s*$', l): | |
| 241 del lines[-1] | |
| 242 else: | |
| 243 break | |
| 244 | |
| 2819 | 245 pf = self.join(patch) |
| 1808 | 246 message = [] |
| 247 comments = [] | |
| 248 user = None | |
|
2299
dacf718e1d48
Add timestamp field to export format. Make import and mq use it.
Danek Duvall <danek.duvall@sun.com>
parents:
2270
diff
changeset
|
249 date = None |
| 1808 | 250 format = None |
| 251 subject = None | |
| 252 diffstart = 0 | |
| 253 | |
| 254 for line in file(pf): | |
| 255 line = line.rstrip() | |
|
2940
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2928
diff
changeset
|
256 if line.startswith('diff --git'): |
|
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2928
diff
changeset
|
257 diffstart = 2 |
|
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2928
diff
changeset
|
258 break |
| 1808 | 259 if diffstart: |
| 260 if line.startswith('+++ '): | |
| 261 diffstart = 2 | |
| 262 break | |
| 263 if line.startswith("--- "): | |
| 264 diffstart = 1 | |
| 265 continue | |
| 266 elif format == "hgpatch": | |
| 267 # parse values when importing the result of an hg export | |
| 268 if line.startswith("# User "): | |
| 269 user = line[7:] | |
|
2300
52b9b6751b2c
Use "# Date" instead of "# Timestamp" for dated export/import of patches.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2299
diff
changeset
|
270 elif line.startswith("# Date "): |
|
52b9b6751b2c
Use "# Date" instead of "# Timestamp" for dated export/import of patches.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2299
diff
changeset
|
271 date = line[7:] |
| 1808 | 272 elif not line.startswith("# ") and line: |
| 273 message.append(line) | |
| 274 format = None | |
| 275 elif line == '# HG changeset patch': | |
| 276 format = "hgpatch" | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
277 elif (format != "tagdone" and (line.startswith("Subject: ") or |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
278 line.startswith("subject: "))): |
| 1808 | 279 subject = line[9:] |
| 280 format = "tag" | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
281 elif (format != "tagdone" and (line.startswith("From: ") or |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
282 line.startswith("from: "))): |
| 1808 | 283 user = line[6:] |
| 284 format = "tag" | |
| 285 elif format == "tag" and line == "": | |
| 286 # when looking for tags (subject: from: etc) they | |
| 287 # end once you find a blank line in the source | |
| 288 format = "tagdone" | |
|
2301
7c2623aedeb4
Strip empty lines and trailing spaces around commit messages.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2300
diff
changeset
|
289 elif message or line: |
| 1808 | 290 message.append(line) |
| 291 comments.append(line) | |
| 292 | |
| 293 eatdiff(message) | |
| 294 eatdiff(comments) | |
| 295 eatempty(message) | |
| 296 eatempty(comments) | |
| 297 | |
| 298 # make sure message isn't empty | |
| 299 if format and format.startswith("tag") and subject: | |
| 300 message.insert(0, "") | |
| 301 message.insert(0, subject) | |
|
2299
dacf718e1d48
Add timestamp field to export format. Make import and mq use it.
Danek Duvall <danek.duvall@sun.com>
parents:
2270
diff
changeset
|
302 return (message, comments, user, date, diffstart > 1) |
| 1808 | 303 |
|
2880
4ec58b157265
refactor text diff/patch code.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2879
diff
changeset
|
304 def printdiff(self, repo, node1, node2=None, files=None, |
|
2943
9dc568f5e03d
Fix test-mq-qdiff; add -I and -X options to qdiff
Brendan Cully <brendan@kublai.com>
parents:
2942
diff
changeset
|
305 fp=None, changes=None, opts={}): |
|
9dc568f5e03d
Fix test-mq-qdiff; add -I and -X options to qdiff
Brendan Cully <brendan@kublai.com>
parents:
2942
diff
changeset
|
306 fns, matchfn, anypats = cmdutil.matchpats(repo, files, opts) |
|
9dc568f5e03d
Fix test-mq-qdiff; add -I and -X options to qdiff
Brendan Cully <brendan@kublai.com>
parents:
2942
diff
changeset
|
307 |
|
9dc568f5e03d
Fix test-mq-qdiff; add -I and -X options to qdiff
Brendan Cully <brendan@kublai.com>
parents:
2942
diff
changeset
|
308 patch.diff(repo, node1, node2, fns, match=matchfn, |
|
2880
4ec58b157265
refactor text diff/patch code.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2879
diff
changeset
|
309 fp=fp, changes=changes, opts=self.diffopts()) |
|
4ec58b157265
refactor text diff/patch code.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2879
diff
changeset
|
310 |
| 1808 | 311 def mergeone(self, repo, mergeq, head, patch, rev, wlock): |
| 312 # first try just applying the patch | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
313 (err, n) = self.apply(repo, [ patch ], update_status=False, |
| 1808 | 314 strict=True, merge=rev, wlock=wlock) |
| 315 | |
| 316 if err == 0: | |
| 317 return (err, n) | |
| 318 | |
| 319 if n is None: | |
|
2712
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2711
diff
changeset
|
320 raise util.Abort(_("apply failed for patch %s") % patch) |
| 1808 | 321 |
| 322 self.ui.warn("patch didn't work out, merging %s\n" % patch) | |
| 323 | |
| 324 # apply failed, strip away that rev and merge. | |
|
2808
30f59f4a327e
Introduce update helper functions: update, merge, clean, and revert
Matt Mackall <mpm@selenic.com>
parents:
2804
diff
changeset
|
325 hg.clean(repo, head, wlock=wlock) |
| 1808 | 326 self.strip(repo, n, update=False, backup='strip', wlock=wlock) |
| 327 | |
| 328 c = repo.changelog.read(rev) | |
|
2808
30f59f4a327e
Introduce update helper functions: update, merge, clean, and revert
Matt Mackall <mpm@selenic.com>
parents:
2804
diff
changeset
|
329 ret = hg.merge(repo, rev, wlock=wlock) |
| 1808 | 330 if ret: |
|
2712
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2711
diff
changeset
|
331 raise util.Abort(_("update returned %d") % ret) |
| 1808 | 332 n = repo.commit(None, c[4], c[1], force=1, wlock=wlock) |
| 333 if n == None: | |
|
2712
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2711
diff
changeset
|
334 raise util.Abort(_("repo commit failed")) |
| 1808 | 335 try: |
|
2299
dacf718e1d48
Add timestamp field to export format. Make import and mq use it.
Danek Duvall <danek.duvall@sun.com>
parents:
2270
diff
changeset
|
336 message, comments, user, date, patchfound = mergeq.readheaders(patch) |
| 1808 | 337 except: |
|
2712
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2711
diff
changeset
|
338 raise util.Abort(_("unable to read %s") % patch) |
| 1808 | 339 |
|
1852
fdf9cbf56ec7
Fix mq's usage of opener, which don't allow absolute paths now.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1839
diff
changeset
|
340 patchf = self.opener(patch, "w") |
| 1808 | 341 if comments: |
| 342 comments = "\n".join(comments) + '\n\n' | |
| 343 patchf.write(comments) | |
|
2880
4ec58b157265
refactor text diff/patch code.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2879
diff
changeset
|
344 self.printdiff(repo, head, n, fp=patchf) |
| 1808 | 345 patchf.close() |
| 346 return (0, n) | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
347 |
| 1808 | 348 def qparents(self, repo, rev=None): |
| 349 if rev is None: | |
| 350 (p1, p2) = repo.dirstate.parents() | |
| 351 if p2 == revlog.nullid: | |
| 352 return p1 | |
| 353 if len(self.applied) == 0: | |
| 354 return None | |
|
2780
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
355 return revlog.bin(self.applied[-1].rev) |
| 1808 | 356 pp = repo.changelog.parents(rev) |
| 357 if pp[1] != revlog.nullid: | |
|
2780
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
358 arevs = [ x.rev for x in self.applied ] |
| 1808 | 359 p0 = revlog.hex(pp[0]) |
| 360 p1 = revlog.hex(pp[1]) | |
| 361 if p0 in arevs: | |
| 362 return pp[0] | |
| 363 if p1 in arevs: | |
| 364 return pp[1] | |
| 365 return pp[0] | |
| 366 | |
| 367 def mergepatch(self, repo, mergeq, series, wlock): | |
| 368 if len(self.applied) == 0: | |
| 369 # each of the patches merged in will have two parents. This | |
| 370 # can confuse the qrefresh, qdiff, and strip code because it | |
| 371 # needs to know which parent is actually in the patch queue. | |
| 372 # so, we insert a merge marker with only one parent. This way | |
| 373 # the first patch in the queue is never a merge patch | |
| 374 # | |
| 375 pname = ".hg.patches.merge.marker" | |
| 376 n = repo.commit(None, '[mq]: merge marker', user=None, force=1, | |
| 377 wlock=wlock) | |
|
2818
bdc067ff6cf5
Make mq camelcase consistent with the rest of hg.
Brendan Cully <brendan@kublai.com>
parents:
2816
diff
changeset
|
378 self.applied.append(statusentry(revlog.hex(n), pname)) |
| 1808 | 379 self.applied_dirty = 1 |
| 380 | |
| 381 head = self.qparents(repo) | |
| 382 | |
| 383 for patch in series: | |
| 2696 | 384 patch = mergeq.lookup(patch, strict=True) |
| 1808 | 385 if not patch: |
| 386 self.ui.warn("patch %s does not exist\n" % patch) | |
| 387 return (1, None) | |
|
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
388 pushable, reason = self.pushable(patch) |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
389 if not pushable: |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
390 self.explain_pushable(patch, all_patches=True) |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
391 continue |
| 1808 | 392 info = mergeq.isapplied(patch) |
| 393 if not info: | |
| 394 self.ui.warn("patch %s is not applied\n" % patch) | |
| 395 return (1, None) | |
| 396 rev = revlog.bin(info[1]) | |
| 397 (err, head) = self.mergeone(repo, mergeq, head, patch, rev, wlock) | |
| 398 if head: | |
|
2818
bdc067ff6cf5
Make mq camelcase consistent with the rest of hg.
Brendan Cully <brendan@kublai.com>
parents:
2816
diff
changeset
|
399 self.applied.append(statusentry(revlog.hex(head), patch)) |
| 1808 | 400 self.applied_dirty = 1 |
| 401 if err: | |
| 402 return (err, head) | |
| 403 return (0, head) | |
| 404 | |
|
2748
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
405 def patch(self, repo, patchfile): |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
406 '''Apply patchfile to the working directory. |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
407 patchfile: file name of patch''' |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
408 try: |
|
2925
b70740aefa4d
Unify mq and hg patch invocation.
Brendan Cully <brendan@kublai.com>
parents:
2911
diff
changeset
|
409 (files, fuzz) = patch.patch(patchfile, self.ui, strip=1, |
|
b70740aefa4d
Unify mq and hg patch invocation.
Brendan Cully <brendan@kublai.com>
parents:
2911
diff
changeset
|
410 cwd=repo.root) |
|
b70740aefa4d
Unify mq and hg patch invocation.
Brendan Cully <brendan@kublai.com>
parents:
2911
diff
changeset
|
411 except Exception, inst: |
|
b70740aefa4d
Unify mq and hg patch invocation.
Brendan Cully <brendan@kublai.com>
parents:
2911
diff
changeset
|
412 self.ui.note(str(inst) + '\n') |
|
b70740aefa4d
Unify mq and hg patch invocation.
Brendan Cully <brendan@kublai.com>
parents:
2911
diff
changeset
|
413 if not self.ui.verbose: |
|
b70740aefa4d
Unify mq and hg patch invocation.
Brendan Cully <brendan@kublai.com>
parents:
2911
diff
changeset
|
414 self.ui.warn("patch failed, unable to continue (try -v)\n") |
|
b70740aefa4d
Unify mq and hg patch invocation.
Brendan Cully <brendan@kublai.com>
parents:
2911
diff
changeset
|
415 return (False, [], False) |
|
2748
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
416 |
|
2940
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2928
diff
changeset
|
417 return (True, files, fuzz) |
|
2796
4c39568007f9
mq: codingstyle
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2795
diff
changeset
|
418 |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
419 def apply(self, repo, series, list=False, update_status=True, |
| 1808 | 420 strict=False, patchdir=None, merge=None, wlock=None): |
| 421 # TODO unify with commands.py | |
| 422 if not patchdir: | |
| 423 patchdir = self.path | |
| 424 err = 0 | |
| 425 if not wlock: | |
| 426 wlock = repo.wlock() | |
| 427 lock = repo.lock() | |
| 428 tr = repo.transaction() | |
| 429 n = None | |
|
2940
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2928
diff
changeset
|
430 for patchname in series: |
|
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2928
diff
changeset
|
431 pushable, reason = self.pushable(patchname) |
|
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
432 if not pushable: |
|
2940
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2928
diff
changeset
|
433 self.explain_pushable(patchname, all_patches=True) |
|
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
434 continue |
|
2940
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2928
diff
changeset
|
435 self.ui.warn("applying %s\n" % patchname) |
|
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2928
diff
changeset
|
436 pf = os.path.join(patchdir, patchname) |
| 1808 | 437 |
| 438 try: | |
|
2940
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2928
diff
changeset
|
439 message, comments, user, date, patchfound = self.readheaders(patchname) |
| 1808 | 440 except: |
|
2940
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2928
diff
changeset
|
441 self.ui.warn("Unable to read %s\n" % patchname) |
| 1808 | 442 err = 1 |
| 443 break | |
| 444 | |
| 445 if not message: | |
|
2940
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2928
diff
changeset
|
446 message = "imported patch %s\n" % patchname |
| 1808 | 447 else: |
| 448 if list: | |
|
2940
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2928
diff
changeset
|
449 message.append("\nimported patch %s" % patchname) |
| 1808 | 450 message = '\n'.join(message) |
| 451 | |
|
2748
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
452 (patcherr, files, fuzz) = self.patch(repo, pf) |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
453 patcherr = not patcherr |
| 1808 | 454 |
|
2940
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2928
diff
changeset
|
455 if merge and files: |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
456 # Mark as merged and update dirstate parent info |
|
2940
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2928
diff
changeset
|
457 repo.dirstate.update(repo.dirstate.filterfiles(files.keys()), 'm') |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
458 p1, p2 = repo.dirstate.parents() |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
459 repo.dirstate.setparents(p1, merge) |
|
2940
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2928
diff
changeset
|
460 files = patch.updatedir(self.ui, repo, files, wlock=wlock) |
|
2299
dacf718e1d48
Add timestamp field to export format. Make import and mq use it.
Danek Duvall <danek.duvall@sun.com>
parents:
2270
diff
changeset
|
461 n = repo.commit(files, message, user, date, force=1, lock=lock, |
| 1808 | 462 wlock=wlock) |
| 463 | |
| 464 if n == None: | |
|
2712
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2711
diff
changeset
|
465 raise util.Abort(_("repo commit failed")) |
| 1808 | 466 |
| 467 if update_status: | |
|
2940
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2928
diff
changeset
|
468 self.applied.append(statusentry(revlog.hex(n), patchname)) |
| 1808 | 469 |
| 470 if patcherr: | |
| 471 if not patchfound: | |
|
2940
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2928
diff
changeset
|
472 self.ui.warn("patch %s is empty\n" % patchname) |
| 1808 | 473 err = 0 |
| 474 else: | |
| 475 self.ui.warn("patch failed, rejects left in working dir\n") | |
| 476 err = 1 | |
| 477 break | |
| 478 | |
| 479 if fuzz and strict: | |
| 480 self.ui.warn("fuzz found when applying patch, stopping\n") | |
| 481 err = 1 | |
| 482 break | |
| 483 tr.close() | |
| 484 return (err, n) | |
| 485 | |
|
3094
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
3093
diff
changeset
|
486 def delete(self, repo, patches, opts): |
|
2911
790fd342b6c7
Allow qdel to delete multiple patches.
Brendan Cully <brendan@kublai.com>
parents:
2910
diff
changeset
|
487 realpatches = [] |
|
3094
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
3093
diff
changeset
|
488 appliedbase = 0 |
|
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
3093
diff
changeset
|
489 forget = opts.get('forget') |
|
2911
790fd342b6c7
Allow qdel to delete multiple patches.
Brendan Cully <brendan@kublai.com>
parents:
2910
diff
changeset
|
490 for patch in patches: |
|
790fd342b6c7
Allow qdel to delete multiple patches.
Brendan Cully <brendan@kublai.com>
parents:
2910
diff
changeset
|
491 patch = self.lookup(patch, strict=True) |
|
790fd342b6c7
Allow qdel to delete multiple patches.
Brendan Cully <brendan@kublai.com>
parents:
2910
diff
changeset
|
492 info = self.isapplied(patch) |
|
3094
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
3093
diff
changeset
|
493 if info and not forget: |
|
2911
790fd342b6c7
Allow qdel to delete multiple patches.
Brendan Cully <brendan@kublai.com>
parents:
2910
diff
changeset
|
494 raise util.Abort(_("cannot delete applied patch %s") % patch) |
|
790fd342b6c7
Allow qdel to delete multiple patches.
Brendan Cully <brendan@kublai.com>
parents:
2910
diff
changeset
|
495 if patch not in self.series: |
|
790fd342b6c7
Allow qdel to delete multiple patches.
Brendan Cully <brendan@kublai.com>
parents:
2910
diff
changeset
|
496 raise util.Abort(_("patch %s not in series file") % patch) |
|
3094
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
3093
diff
changeset
|
497 if forget: |
|
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
3093
diff
changeset
|
498 if not info: |
|
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
3093
diff
changeset
|
499 raise util.Abort(_("cannot forget unapplied patch %s") % patch) |
|
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
3093
diff
changeset
|
500 if info[0] != appliedbase: |
|
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
3093
diff
changeset
|
501 raise util.Abort(_("patch %s not at base") % patch) |
|
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
3093
diff
changeset
|
502 appliedbase += 1 |
|
2911
790fd342b6c7
Allow qdel to delete multiple patches.
Brendan Cully <brendan@kublai.com>
parents:
2910
diff
changeset
|
503 realpatches.append(patch) |
|
790fd342b6c7
Allow qdel to delete multiple patches.
Brendan Cully <brendan@kublai.com>
parents:
2910
diff
changeset
|
504 |
|
3094
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
3093
diff
changeset
|
505 if not opts.get('keep'): |
|
2752
5dfeda163bb7
Add -f option to qdelete, to remove patch file.
Brendan Cully <brendan@kublai.com>
parents:
2751
diff
changeset
|
506 r = self.qrepo() |
|
5dfeda163bb7
Add -f option to qdelete, to remove patch file.
Brendan Cully <brendan@kublai.com>
parents:
2751
diff
changeset
|
507 if r: |
|
2911
790fd342b6c7
Allow qdel to delete multiple patches.
Brendan Cully <brendan@kublai.com>
parents:
2910
diff
changeset
|
508 r.remove(realpatches, True) |
|
2752
5dfeda163bb7
Add -f option to qdelete, to remove patch file.
Brendan Cully <brendan@kublai.com>
parents:
2751
diff
changeset
|
509 else: |
| 2819 | 510 os.unlink(self.join(patch)) |
|
2911
790fd342b6c7
Allow qdel to delete multiple patches.
Brendan Cully <brendan@kublai.com>
parents:
2910
diff
changeset
|
511 |
|
3094
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
3093
diff
changeset
|
512 if forget: |
|
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
3093
diff
changeset
|
513 del self.applied[:appliedbase] |
|
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
3093
diff
changeset
|
514 self.applied_dirty = 1 |
|
2911
790fd342b6c7
Allow qdel to delete multiple patches.
Brendan Cully <brendan@kublai.com>
parents:
2910
diff
changeset
|
515 indices = [self.find_series(p) for p in realpatches] |
|
790fd342b6c7
Allow qdel to delete multiple patches.
Brendan Cully <brendan@kublai.com>
parents:
2910
diff
changeset
|
516 indices.sort() |
|
790fd342b6c7
Allow qdel to delete multiple patches.
Brendan Cully <brendan@kublai.com>
parents:
2910
diff
changeset
|
517 for i in indices[-1::-1]: |
|
790fd342b6c7
Allow qdel to delete multiple patches.
Brendan Cully <brendan@kublai.com>
parents:
2910
diff
changeset
|
518 del self.full_series[i] |
|
2767
60683ab1ed33
mq: rename read_series as parse_series, make simpler and faster
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2766
diff
changeset
|
519 self.parse_series() |
| 1808 | 520 self.series_dirty = 1 |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
521 |
| 1808 | 522 def check_toppatch(self, repo): |
| 523 if len(self.applied) > 0: | |
|
2780
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
524 top = revlog.bin(self.applied[-1].rev) |
| 1808 | 525 pp = repo.dirstate.parents() |
| 526 if top not in pp: | |
|
2712
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2711
diff
changeset
|
527 raise util.Abort(_("queue top not at same revision as working directory")) |
| 1808 | 528 return top |
| 529 return None | |
|
2881
3d6efcbbd1c9
remove localrepository.changes.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2880
diff
changeset
|
530 def check_localchanges(self, repo, force=False, refresh=True): |
|
3d6efcbbd1c9
remove localrepository.changes.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2880
diff
changeset
|
531 m, a, r, d = repo.status()[:4] |
|
3d6efcbbd1c9
remove localrepository.changes.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2880
diff
changeset
|
532 if m or a or r or d: |
|
3d6efcbbd1c9
remove localrepository.changes.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2880
diff
changeset
|
533 if not force: |
|
3d6efcbbd1c9
remove localrepository.changes.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2880
diff
changeset
|
534 if refresh: |
|
3d6efcbbd1c9
remove localrepository.changes.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2880
diff
changeset
|
535 raise util.Abort(_("local changes found, refresh first")) |
|
3d6efcbbd1c9
remove localrepository.changes.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2880
diff
changeset
|
536 else: |
|
3d6efcbbd1c9
remove localrepository.changes.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2880
diff
changeset
|
537 raise util.Abort(_("local changes found")) |
|
3d6efcbbd1c9
remove localrepository.changes.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2880
diff
changeset
|
538 return m, a, r, d |
| 1808 | 539 def new(self, repo, patch, msg=None, force=None): |
| 2819 | 540 if os.path.exists(self.join(patch)): |
|
2711
ca97be5babf8
mq: do not allow to qnew a patch twice
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2699
diff
changeset
|
541 raise util.Abort(_('patch "%s" already exists') % patch) |
|
2881
3d6efcbbd1c9
remove localrepository.changes.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2880
diff
changeset
|
542 m, a, r, d = self.check_localchanges(repo, force) |
|
3d6efcbbd1c9
remove localrepository.changes.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2880
diff
changeset
|
543 commitfiles = m + a + r |
| 1808 | 544 self.check_toppatch(repo) |
| 545 wlock = repo.wlock() | |
|
2698
c1123e83c8e2
mq: fix qnew and qimport to deal with series file comments
Chris Mason <mason@suse.com>
parents:
2697
diff
changeset
|
546 insert = self.full_series_end() |
| 1808 | 547 if msg: |
|
2511
041d8f0a8437
mq: hg qnew -f should refresh the new patch
Chris Mason <mason@suse.com>
parents:
2488
diff
changeset
|
548 n = repo.commit(commitfiles, "[mq]: %s" % msg, force=True, |
|
041d8f0a8437
mq: hg qnew -f should refresh the new patch
Chris Mason <mason@suse.com>
parents:
2488
diff
changeset
|
549 wlock=wlock) |
| 1808 | 550 else: |
|
2511
041d8f0a8437
mq: hg qnew -f should refresh the new patch
Chris Mason <mason@suse.com>
parents:
2488
diff
changeset
|
551 n = repo.commit(commitfiles, |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
552 "New patch: %s" % patch, force=True, wlock=wlock) |
| 1808 | 553 if n == None: |
|
2712
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2711
diff
changeset
|
554 raise util.Abort(_("repo commit failed")) |
| 1808 | 555 self.full_series[insert:insert] = [patch] |
|
2818
bdc067ff6cf5
Make mq camelcase consistent with the rest of hg.
Brendan Cully <brendan@kublai.com>
parents:
2816
diff
changeset
|
556 self.applied.append(statusentry(revlog.hex(n), patch)) |
|
2767
60683ab1ed33
mq: rename read_series as parse_series, make simpler and faster
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2766
diff
changeset
|
557 self.parse_series() |
| 1808 | 558 self.series_dirty = 1 |
| 559 self.applied_dirty = 1 | |
|
1852
fdf9cbf56ec7
Fix mq's usage of opener, which don't allow absolute paths now.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1839
diff
changeset
|
560 p = self.opener(patch, "w") |
| 1808 | 561 if msg: |
| 562 msg = msg + "\n" | |
| 563 p.write(msg) | |
| 564 p.close() | |
| 565 wlock = None | |
| 566 r = self.qrepo() | |
| 567 if r: r.add([patch]) | |
|
2511
041d8f0a8437
mq: hg qnew -f should refresh the new patch
Chris Mason <mason@suse.com>
parents:
2488
diff
changeset
|
568 if commitfiles: |
|
2862
a3c73c9679d2
Fix "hg qnew -f foo" without -m
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
2861
diff
changeset
|
569 self.refresh(repo, short=True) |
| 1808 | 570 |
| 571 def strip(self, repo, rev, update=True, backup="all", wlock=None): | |
| 572 def limitheads(chlog, stop): | |
| 573 """return the list of all nodes that have no children""" | |
| 574 p = {} | |
| 575 h = [] | |
| 576 stoprev = 0 | |
| 577 if stop in chlog.nodemap: | |
| 578 stoprev = chlog.rev(stop) | |
| 579 | |
| 580 for r in range(chlog.count() - 1, -1, -1): | |
| 581 n = chlog.node(r) | |
| 582 if n not in p: | |
| 583 h.append(n) | |
| 584 if n == stop: | |
| 585 break | |
| 586 if r < stoprev: | |
| 587 break | |
| 588 for pn in chlog.parents(n): | |
| 589 p[pn] = 1 | |
| 590 return h | |
| 591 | |
| 592 def bundle(cg): | |
| 593 backupdir = repo.join("strip-backup") | |
| 594 if not os.path.isdir(backupdir): | |
| 595 os.mkdir(backupdir) | |
| 596 name = os.path.join(backupdir, "%s" % revlog.short(rev)) | |
| 597 name = savename(name) | |
| 598 self.ui.warn("saving bundle to %s\n" % name) | |
| 599 # TODO, exclusive open | |
| 600 f = open(name, "wb") | |
| 601 try: | |
| 602 f.write("HG10") | |
| 603 z = bz2.BZ2Compressor(9) | |
| 604 while 1: | |
| 605 chunk = cg.read(4096) | |
| 606 if not chunk: | |
| 607 break | |
| 608 f.write(z.compress(chunk)) | |
| 609 f.write(z.flush()) | |
| 610 except: | |
| 611 os.unlink(name) | |
| 612 raise | |
| 613 f.close() | |
| 614 return name | |
| 615 | |
| 616 def stripall(rev, revnum): | |
| 617 cl = repo.changelog | |
| 618 c = cl.read(rev) | |
| 619 mm = repo.manifest.read(c[0]) | |
| 620 seen = {} | |
| 621 | |
| 622 for x in xrange(revnum, cl.count()): | |
| 623 c = cl.read(cl.node(x)) | |
| 624 for f in c[3]: | |
| 625 if f in seen: | |
| 626 continue | |
| 627 seen[f] = 1 | |
| 628 if f in mm: | |
| 629 filerev = mm[f] | |
| 630 else: | |
| 631 filerev = 0 | |
| 632 seen[f] = filerev | |
| 633 # we go in two steps here so the strip loop happens in a | |
| 634 # sensible order. When stripping many files, this helps keep | |
| 635 # our disk access patterns under control. | |
|
2794
86c54b7cd331
mq: fix variables shadowing builtin
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2792
diff
changeset
|
636 seen_list = seen.keys() |
|
86c54b7cd331
mq: fix variables shadowing builtin
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2792
diff
changeset
|
637 seen_list.sort() |
|
86c54b7cd331
mq: fix variables shadowing builtin
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2792
diff
changeset
|
638 for f in seen_list: |
| 1808 | 639 ff = repo.file(f) |
| 640 filerev = seen[f] | |
| 641 if filerev != 0: | |
| 642 if filerev in ff.nodemap: | |
| 643 filerev = ff.rev(filerev) | |
| 644 else: | |
| 645 filerev = 0 | |
| 646 ff.strip(filerev, revnum) | |
| 647 | |
| 648 if not wlock: | |
| 649 wlock = repo.wlock() | |
| 650 lock = repo.lock() | |
| 651 chlog = repo.changelog | |
| 652 # TODO delete the undo files, and handle undo of merge sets | |
| 653 pp = chlog.parents(rev) | |
| 654 revnum = chlog.rev(rev) | |
| 655 | |
| 656 if update: | |
|
2881
3d6efcbbd1c9
remove localrepository.changes.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2880
diff
changeset
|
657 self.check_localchanges(repo, refresh=False) |
| 1808 | 658 urev = self.qparents(repo, rev) |
|
2808
30f59f4a327e
Introduce update helper functions: update, merge, clean, and revert
Matt Mackall <mpm@selenic.com>
parents:
2804
diff
changeset
|
659 hg.clean(repo, urev, wlock=wlock) |
| 1808 | 660 repo.dirstate.write() |
| 661 | |
| 662 # save is a list of all the branches we are truncating away | |
| 663 # that we actually want to keep. changegroup will be used | |
| 664 # to preserve them and add them back after the truncate | |
| 665 saveheads = [] | |
| 666 savebases = {} | |
| 667 | |
| 668 heads = limitheads(chlog, rev) | |
| 669 seen = {} | |
| 670 | |
| 671 # search through all the heads, finding those where the revision | |
| 672 # we want to strip away is an ancestor. Also look for merges | |
| 673 # that might be turned into new heads by the strip. | |
| 674 while heads: | |
| 675 h = heads.pop() | |
| 676 n = h | |
| 677 while True: | |
| 678 seen[n] = 1 | |
| 679 pp = chlog.parents(n) | |
| 680 if pp[1] != revlog.nullid and chlog.rev(pp[1]) > revnum: | |
| 681 if pp[1] not in seen: | |
| 682 heads.append(pp[1]) | |
| 683 if pp[0] == revlog.nullid: | |
| 684 break | |
| 685 if chlog.rev(pp[0]) < revnum: | |
| 686 break | |
| 687 n = pp[0] | |
| 688 if n == rev: | |
| 689 break | |
| 690 r = chlog.reachable(h, rev) | |
| 691 if rev not in r: | |
| 692 saveheads.append(h) | |
| 693 for x in r: | |
| 694 if chlog.rev(x) > revnum: | |
| 695 savebases[x] = 1 | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
696 |
| 1808 | 697 # create a changegroup for all the branches we need to keep |
|
2797
a3c6e7888abf
mq: unused variables, improper usage of 'is [not]', undefined variable
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2796
diff
changeset
|
698 if backup == "all": |
| 1808 | 699 backupch = repo.changegroupsubset([rev], chlog.heads(), 'strip') |
| 700 bundle(backupch) | |
| 701 if saveheads: | |
| 702 backupch = repo.changegroupsubset(savebases.keys(), saveheads, 'strip') | |
| 703 chgrpfile = bundle(backupch) | |
| 704 | |
| 705 stripall(rev, revnum) | |
| 706 | |
| 707 change = chlog.read(rev) | |
|
3081
e20e7e2623b0
strip: strip changelog before manifest
Brendan Cully <brendan@kublai.com>
parents:
3033
diff
changeset
|
708 chlog.strip(revnum, revnum) |
| 1808 | 709 repo.manifest.strip(repo.manifest.rev(change[0]), revnum) |
| 710 if saveheads: | |
| 711 self.ui.status("adding branch\n") | |
| 712 commands.unbundle(self.ui, repo, chgrpfile, update=False) | |
|
2797
a3c6e7888abf
mq: unused variables, improper usage of 'is [not]', undefined variable
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2796
diff
changeset
|
713 if backup != "strip": |
| 1808 | 714 os.unlink(chgrpfile) |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
715 |
| 1808 | 716 def isapplied(self, patch): |
| 717 """returns (index, rev, patch)""" | |
| 718 for i in xrange(len(self.applied)): | |
|
2780
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
719 a = self.applied[i] |
|
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
720 if a.name == patch: |
|
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
721 return (i, a.rev, a.name) |
| 1808 | 722 return None |
| 723 | |
| 2696 | 724 # if the exact patch name does not exist, we try a few |
| 725 # variations. If strict is passed, we try only #1 | |
| 726 # | |
| 727 # 1) a number to indicate an offset in the series file | |
| 728 # 2) a unique substring of the patch name was given | |
| 729 # 3) patchname[-+]num to indicate an offset in the series file | |
| 730 def lookup(self, patch, strict=False): | |
|
2850
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2830
diff
changeset
|
731 patch = patch and str(patch) |
|
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2830
diff
changeset
|
732 |
| 2696 | 733 def partial_name(s): |
| 734 if s in self.series: | |
| 735 return s | |
|
2765
0327bd1c831c
mq: print matches if patch name not unique
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2757
diff
changeset
|
736 matches = [x for x in self.series if s in x] |
|
0327bd1c831c
mq: print matches if patch name not unique
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2757
diff
changeset
|
737 if len(matches) > 1: |
|
0327bd1c831c
mq: print matches if patch name not unique
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2757
diff
changeset
|
738 self.ui.warn(_('patch name "%s" is ambiguous:\n') % s) |
|
0327bd1c831c
mq: print matches if patch name not unique
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2757
diff
changeset
|
739 for m in matches: |
|
0327bd1c831c
mq: print matches if patch name not unique
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2757
diff
changeset
|
740 self.ui.warn(' %s\n' % m) |
|
0327bd1c831c
mq: print matches if patch name not unique
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2757
diff
changeset
|
741 return None |
|
0327bd1c831c
mq: print matches if patch name not unique
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2757
diff
changeset
|
742 if matches: |
|
0327bd1c831c
mq: print matches if patch name not unique
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2757
diff
changeset
|
743 return matches[0] |
| 2696 | 744 if len(self.series) > 0 and len(self.applied) > 0: |
| 745 if s == 'qtip': | |
| 746 return self.series[self.series_end()-1] | |
| 747 if s == 'qbase': | |
| 748 return self.series[0] | |
| 749 return None | |
| 1808 | 750 if patch == None: |
| 751 return None | |
| 2696 | 752 |
| 753 # we don't want to return a partial match until we make | |
| 754 # sure the file name passed in does not exist (checked below) | |
| 755 res = partial_name(patch) | |
| 756 if res and res == patch: | |
| 757 return res | |
| 758 | |
| 2819 | 759 if not os.path.isfile(self.join(patch)): |
| 1808 | 760 try: |
| 761 sno = int(patch) | |
| 762 except(ValueError, OverflowError): | |
| 2696 | 763 pass |
| 764 else: | |
| 765 if sno < len(self.series): | |
|
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
766 return self.series[sno] |
| 2696 | 767 if not strict: |
| 768 # return any partial match made above | |
| 769 if res: | |
| 770 return res | |
|
3088
bed7cb835d8d
Fixed python2.3 incompatibility (rsplit) in qpush/qpop with index.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3082
diff
changeset
|
771 minus = patch.rfind('-') |
|
bed7cb835d8d
Fixed python2.3 incompatibility (rsplit) in qpush/qpop with index.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3082
diff
changeset
|
772 if minus >= 0: |
|
bed7cb835d8d
Fixed python2.3 incompatibility (rsplit) in qpush/qpop with index.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3082
diff
changeset
|
773 res = partial_name(patch[:minus]) |
| 2696 | 774 if res: |
| 775 i = self.series.index(res) | |
| 776 try: | |
|
3088
bed7cb835d8d
Fixed python2.3 incompatibility (rsplit) in qpush/qpop with index.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3082
diff
changeset
|
777 off = int(patch[minus+1:] or 1) |
| 2696 | 778 except(ValueError, OverflowError): |
| 779 pass | |
| 780 else: | |
| 781 if i - off >= 0: | |
| 782 return self.series[i - off] | |
|
3088
bed7cb835d8d
Fixed python2.3 incompatibility (rsplit) in qpush/qpop with index.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3082
diff
changeset
|
783 plus = patch.rfind('+') |
|
bed7cb835d8d
Fixed python2.3 incompatibility (rsplit) in qpush/qpop with index.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3082
diff
changeset
|
784 if plus >= 0: |
|
bed7cb835d8d
Fixed python2.3 incompatibility (rsplit) in qpush/qpop with index.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3082
diff
changeset
|
785 res = partial_name(patch[:plus]) |
| 2696 | 786 if res: |
| 787 i = self.series.index(res) | |
| 788 try: | |
|
3088
bed7cb835d8d
Fixed python2.3 incompatibility (rsplit) in qpush/qpop with index.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3082
diff
changeset
|
789 off = int(patch[plus+1:] or 1) |
| 2696 | 790 except(ValueError, OverflowError): |
| 791 pass | |
| 792 else: | |
| 793 if i + off < len(self.series): | |
| 794 return self.series[i + off] | |
|
2712
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2711
diff
changeset
|
795 raise util.Abort(_("patch %s not in series") % patch) |
| 1808 | 796 |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
797 def push(self, repo, patch=None, force=False, list=False, |
| 1808 | 798 mergeq=None, wlock=None): |
| 799 if not wlock: | |
| 800 wlock = repo.wlock() | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
801 patch = self.lookup(patch) |
| 1808 | 802 if patch and self.isapplied(patch): |
|
2712
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2711
diff
changeset
|
803 self.ui.warn(_("patch %s is already applied\n") % patch) |
| 1808 | 804 sys.exit(1) |
| 805 if self.series_end() == len(self.series): | |
|
2712
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2711
diff
changeset
|
806 self.ui.warn(_("patch series fully applied\n")) |
| 1808 | 807 sys.exit(1) |
| 808 if not force: | |
| 809 self.check_localchanges(repo) | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
810 |
| 1808 | 811 self.applied_dirty = 1; |
| 812 start = self.series_end() | |
| 813 if start > 0: | |
| 814 self.check_toppatch(repo) | |
| 815 if not patch: | |
| 816 patch = self.series[start] | |
| 817 end = start + 1 | |
| 818 else: | |
| 819 end = self.series.index(patch, start) + 1 | |
| 820 s = self.series[start:end] | |
| 821 if mergeq: | |
| 822 ret = self.mergepatch(repo, mergeq, s, wlock) | |
| 823 else: | |
| 824 ret = self.apply(repo, s, list, wlock=wlock) | |
|
2780
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
825 top = self.applied[-1].name |
| 1808 | 826 if ret[0]: |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
827 self.ui.write("Errors during apply, please fix and refresh %s\n" % |
| 1808 | 828 top) |
| 829 else: | |
| 830 self.ui.write("Now at: %s\n" % top) | |
| 831 return ret[0] | |
| 832 | |
|
2697
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
833 def pop(self, repo, patch=None, force=False, update=True, all=False, |
|
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
834 wlock=None): |
| 1808 | 835 def getfile(f, rev): |
| 836 t = repo.file(f).read(rev) | |
| 837 try: | |
| 838 repo.wfile(f, "w").write(t) | |
| 839 except IOError: | |
|
2086
8742352db413
mq: do not fail if directory to create exists
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2047
diff
changeset
|
840 try: |
|
8742352db413
mq: do not fail if directory to create exists
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2047
diff
changeset
|
841 os.makedirs(os.path.dirname(repo.wjoin(f))) |
|
8742352db413
mq: do not fail if directory to create exists
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2047
diff
changeset
|
842 except OSError, err: |
|
8742352db413
mq: do not fail if directory to create exists
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2047
diff
changeset
|
843 if err.errno != errno.EEXIST: raise |
| 1808 | 844 repo.wfile(f, "w").write(t) |
| 845 | |
| 846 if not wlock: | |
| 847 wlock = repo.wlock() | |
| 848 if patch: | |
| 849 # index, rev, patch | |
| 850 info = self.isapplied(patch) | |
| 851 if not info: | |
| 852 patch = self.lookup(patch) | |
| 853 info = self.isapplied(patch) | |
| 854 if not info: | |
|
2712
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2711
diff
changeset
|
855 raise util.Abort(_("patch %s is not applied") % patch) |
| 1808 | 856 if len(self.applied) == 0: |
|
2712
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2711
diff
changeset
|
857 self.ui.warn(_("no patches applied\n")) |
| 1808 | 858 sys.exit(1) |
| 859 | |
| 860 if not update: | |
| 861 parents = repo.dirstate.parents() | |
|
2780
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
862 rr = [ revlog.bin(x.rev) for x in self.applied ] |
| 1808 | 863 for p in parents: |
| 864 if p in rr: | |
| 865 self.ui.warn("qpop: forcing dirstate update\n") | |
| 866 update = True | |
| 867 | |
| 868 if not force and update: | |
| 869 self.check_localchanges(repo) | |
| 870 | |
| 871 self.applied_dirty = 1; | |
| 872 end = len(self.applied) | |
| 873 if not patch: | |
|
2697
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
874 if all: |
|
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
875 popi = 0 |
|
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
876 else: |
|
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
877 popi = len(self.applied) - 1 |
|
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
878 else: |
|
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
879 popi = info[0] + 1 |
|
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
880 if popi >= end: |
|
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
881 self.ui.warn("qpop: %s is already at the top\n" % patch) |
|
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
882 return |
|
2780
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
883 info = [ popi ] + [self.applied[popi].rev, self.applied[popi].name] |
|
2697
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
884 |
| 1808 | 885 start = info[0] |
| 886 rev = revlog.bin(info[1]) | |
| 887 | |
| 888 # we know there are no local changes, so we can make a simplified | |
| 889 # form of hg.update. | |
| 890 if update: | |
| 891 top = self.check_toppatch(repo) | |
| 892 qp = self.qparents(repo, rev) | |
| 893 changes = repo.changelog.read(qp) | |
| 894 mmap = repo.manifest.read(changes[0]) | |
|
2881
3d6efcbbd1c9
remove localrepository.changes.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2880
diff
changeset
|
895 m, a, r, d, u = repo.status(qp, top)[:5] |
| 1808 | 896 if d: |
| 897 raise util.Abort("deletions found between repo revs") | |
|
2881
3d6efcbbd1c9
remove localrepository.changes.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2880
diff
changeset
|
898 for f in m: |
| 1808 | 899 getfile(f, mmap[f]) |
| 900 for f in r: | |
| 901 getfile(f, mmap[f]) | |
|
2878
d36af1f10fdf
manifest.execf is now a function.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2840
diff
changeset
|
902 util.set_exec(repo.wjoin(f), mmap.execf(f)) |
|
2881
3d6efcbbd1c9
remove localrepository.changes.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2880
diff
changeset
|
903 repo.dirstate.update(m + r, 'n') |
| 1808 | 904 for f in a: |
| 905 try: os.unlink(repo.wjoin(f)) | |
| 906 except: raise | |
| 907 try: os.removedirs(os.path.dirname(repo.wjoin(f))) | |
| 908 except: pass | |
| 909 if a: | |
| 910 repo.dirstate.forget(a) | |
| 911 repo.dirstate.setparents(qp, revlog.nullid) | |
| 912 self.strip(repo, rev, update=False, backup='strip', wlock=wlock) | |
| 913 del self.applied[start:end] | |
| 914 if len(self.applied): | |
|
2780
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
915 self.ui.write("Now at: %s\n" % self.applied[-1].name) |
| 1808 | 916 else: |
| 917 self.ui.write("Patch queue now empty\n") | |
| 918 | |
|
2943
9dc568f5e03d
Fix test-mq-qdiff; add -I and -X options to qdiff
Brendan Cully <brendan@kublai.com>
parents:
2942
diff
changeset
|
919 def diff(self, repo, pats, opts): |
| 1808 | 920 top = self.check_toppatch(repo) |
| 921 if not top: | |
| 922 self.ui.write("No patches applied\n") | |
| 923 return | |
| 924 qp = self.qparents(repo, top) | |
|
2943
9dc568f5e03d
Fix test-mq-qdiff; add -I and -X options to qdiff
Brendan Cully <brendan@kublai.com>
parents:
2942
diff
changeset
|
925 self.printdiff(repo, qp, files=pats, opts=opts) |
| 1808 | 926 |
|
2944
5b7a118f5b6c
allow qrefresh to take a list of files; closes #96.
Brendan Cully <brendan@kublai.com>
parents:
2943
diff
changeset
|
927 def refresh(self, repo, pats=None, **opts): |
| 1808 | 928 if len(self.applied) == 0: |
| 929 self.ui.write("No patches applied\n") | |
|
3010
ac74046f8f58
qrefresh: exit with status 1 if no patches applied.
Bryan O'Sullivan <bos@serpentine.com>
parents:
2990
diff
changeset
|
930 return 1 |
| 1808 | 931 wlock = repo.wlock() |
| 932 self.check_toppatch(repo) | |
|
3033
a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents:
3014
diff
changeset
|
933 (top, patchfn) = (self.applied[-1].rev, self.applied[-1].name) |
| 1808 | 934 top = revlog.bin(top) |
| 935 cparents = repo.changelog.parents(top) | |
| 936 patchparent = self.qparents(repo, top) | |
|
3033
a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents:
3014
diff
changeset
|
937 message, comments, user, date, patchfound = self.readheaders(patchfn) |
| 1808 | 938 |
|
3033
a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents:
3014
diff
changeset
|
939 patchf = self.opener(patchfn, "w") |
|
2944
5b7a118f5b6c
allow qrefresh to take a list of files; closes #96.
Brendan Cully <brendan@kublai.com>
parents:
2943
diff
changeset
|
940 msg = opts.get('msg', '').rstrip() |
|
2745
1bac2bfe081a
Change patch header as well as commit message with qrefresh -m or -l.
Brendan Cully <brendan@kublai.com>
parents:
2742
diff
changeset
|
941 if msg: |
|
1bac2bfe081a
Change patch header as well as commit message with qrefresh -m or -l.
Brendan Cully <brendan@kublai.com>
parents:
2742
diff
changeset
|
942 if comments: |
|
1bac2bfe081a
Change patch header as well as commit message with qrefresh -m or -l.
Brendan Cully <brendan@kublai.com>
parents:
2742
diff
changeset
|
943 # Remove existing message. |
|
1bac2bfe081a
Change patch header as well as commit message with qrefresh -m or -l.
Brendan Cully <brendan@kublai.com>
parents:
2742
diff
changeset
|
944 ci = 0 |
|
1bac2bfe081a
Change patch header as well as commit message with qrefresh -m or -l.
Brendan Cully <brendan@kublai.com>
parents:
2742
diff
changeset
|
945 for mi in range(len(message)): |
|
1bac2bfe081a
Change patch header as well as commit message with qrefresh -m or -l.
Brendan Cully <brendan@kublai.com>
parents:
2742
diff
changeset
|
946 while message[mi] != comments[ci]: |
|
1bac2bfe081a
Change patch header as well as commit message with qrefresh -m or -l.
Brendan Cully <brendan@kublai.com>
parents:
2742
diff
changeset
|
947 ci += 1 |
|
1bac2bfe081a
Change patch header as well as commit message with qrefresh -m or -l.
Brendan Cully <brendan@kublai.com>
parents:
2742
diff
changeset
|
948 del comments[ci] |
|
1bac2bfe081a
Change patch header as well as commit message with qrefresh -m or -l.
Brendan Cully <brendan@kublai.com>
parents:
2742
diff
changeset
|
949 comments.append(msg) |
| 1808 | 950 if comments: |
| 951 comments = "\n".join(comments) + '\n\n' | |
| 952 patchf.write(comments) | |
| 953 | |
|
2944
5b7a118f5b6c
allow qrefresh to take a list of files; closes #96.
Brendan Cully <brendan@kublai.com>
parents:
2943
diff
changeset
|
954 fns, matchfn, anypats = cmdutil.matchpats(repo, pats, opts) |
| 1808 | 955 tip = repo.changelog.tip() |
| 956 if top == tip: | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
957 # if the top of our patch queue is also the tip, there is an |
| 1808 | 958 # optimization here. We update the dirstate in place and strip |
| 959 # off the tip commit. Then just commit the current directory | |
| 960 # tree. We can also send repo.commit the list of files | |
| 961 # changed to speed up the diff | |
| 962 # | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
963 # in short mode, we only diff the files included in the |
| 1808 | 964 # patch already |
| 965 # | |
| 966 # this should really read: | |
|
2881
3d6efcbbd1c9
remove localrepository.changes.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2880
diff
changeset
|
967 # mm, dd, aa, aa2, uu = repo.status(tip, patchparent)[:5] |
| 1808 | 968 # but we do it backwards to take advantage of manifest/chlog |
|
2881
3d6efcbbd1c9
remove localrepository.changes.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2880
diff
changeset
|
969 # caching against the next repo.status call |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
970 # |
|
2881
3d6efcbbd1c9
remove localrepository.changes.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2880
diff
changeset
|
971 mm, aa, dd, aa2, uu = repo.status(patchparent, tip)[:5] |
|
2944
5b7a118f5b6c
allow qrefresh to take a list of files; closes #96.
Brendan Cully <brendan@kublai.com>
parents:
2943
diff
changeset
|
972 if opts.get('short'): |
|
2881
3d6efcbbd1c9
remove localrepository.changes.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2880
diff
changeset
|
973 filelist = mm + aa + dd |
| 1808 | 974 else: |
| 975 filelist = None | |
|
2881
3d6efcbbd1c9
remove localrepository.changes.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2880
diff
changeset
|
976 m, a, r, d, u = repo.status(files=filelist)[:5] |
| 1808 | 977 |
| 978 # we might end up with files that were added between tip and | |
| 979 # the dirstate parent, but then changed in the local dirstate. | |
| 980 # in this case, we want them to only show up in the added section | |
|
2881
3d6efcbbd1c9
remove localrepository.changes.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2880
diff
changeset
|
981 for x in m: |
| 1808 | 982 if x not in aa: |
|
2881
3d6efcbbd1c9
remove localrepository.changes.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2880
diff
changeset
|
983 mm.append(x) |
| 1808 | 984 # we might end up with files added by the local dirstate that |
| 985 # were deleted by the patch. In this case, they should only | |
| 986 # show up in the changed section. | |
| 987 for x in a: | |
| 988 if x in dd: | |
| 989 del dd[dd.index(x)] | |
|
2881
3d6efcbbd1c9
remove localrepository.changes.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2880
diff
changeset
|
990 mm.append(x) |
| 1808 | 991 else: |
| 992 aa.append(x) | |
| 993 # make sure any files deleted in the local dirstate | |
| 994 # are not in the add or change column of the patch | |
| 995 forget = [] | |
| 996 for x in d + r: | |
| 997 if x in aa: | |
| 998 del aa[aa.index(x)] | |
| 999 forget.append(x) | |
| 1000 continue | |
|
2881
3d6efcbbd1c9
remove localrepository.changes.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2880
diff
changeset
|
1001 elif x in mm: |
|
3d6efcbbd1c9
remove localrepository.changes.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2880
diff
changeset
|
1002 del mm[mm.index(x)] |
| 1808 | 1003 dd.append(x) |
| 1004 | |
|
2881
3d6efcbbd1c9
remove localrepository.changes.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2880
diff
changeset
|
1005 m = list(util.unique(mm)) |
| 1808 | 1006 r = list(util.unique(dd)) |
| 1007 a = list(util.unique(aa)) | |
|
2944
5b7a118f5b6c
allow qrefresh to take a list of files; closes #96.
Brendan Cully <brendan@kublai.com>
parents:
2943
diff
changeset
|
1008 filelist = filter(matchfn, util.unique(m + r + a)) |
|
3092
17747e80ea6c
mq: Add --git option to qrefresh
Brendan Cully <brendan@kublai.com>
parents:
3091
diff
changeset
|
1009 if opts.get('git'): |
|
17747e80ea6c
mq: Add --git option to qrefresh
Brendan Cully <brendan@kublai.com>
parents:
3091
diff
changeset
|
1010 self.diffopts().git = True |
|
3033
a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents:
3014
diff
changeset
|
1011 patch.diff(repo, patchparent, files=filelist, match=matchfn, |
|
a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents:
3014
diff
changeset
|
1012 fp=patchf, changes=(m, a, r, [], u), |
|
a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents:
3014
diff
changeset
|
1013 opts=self.diffopts()) |
| 1808 | 1014 patchf.close() |
| 1015 | |
| 1016 changes = repo.changelog.read(tip) | |
| 1017 repo.dirstate.setparents(*cparents) | |
|
2940
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2928
diff
changeset
|
1018 copies = [(f, repo.dirstate.copied(f)) for f in a] |
| 1808 | 1019 repo.dirstate.update(a, 'a') |
|
2940
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2928
diff
changeset
|
1020 for dst, src in copies: |
|
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2928
diff
changeset
|
1021 repo.dirstate.copy(src, dst) |
| 1808 | 1022 repo.dirstate.update(r, 'r') |
|
2944
5b7a118f5b6c
allow qrefresh to take a list of files; closes #96.
Brendan Cully <brendan@kublai.com>
parents:
2943
diff
changeset
|
1023 # if the patch excludes a modified file, mark that file with mtime=0 |
|
5b7a118f5b6c
allow qrefresh to take a list of files; closes #96.
Brendan Cully <brendan@kublai.com>
parents:
2943
diff
changeset
|
1024 # so status can see it. |
|
5b7a118f5b6c
allow qrefresh to take a list of files; closes #96.
Brendan Cully <brendan@kublai.com>
parents:
2943
diff
changeset
|
1025 mm = [] |
|
5b7a118f5b6c
allow qrefresh to take a list of files; closes #96.
Brendan Cully <brendan@kublai.com>
parents:
2943
diff
changeset
|
1026 for i in range(len(m)-1, -1, -1): |
|
5b7a118f5b6c
allow qrefresh to take a list of files; closes #96.
Brendan Cully <brendan@kublai.com>
parents:
2943
diff
changeset
|
1027 if not matchfn(m[i]): |
|
5b7a118f5b6c
allow qrefresh to take a list of files; closes #96.
Brendan Cully <brendan@kublai.com>
parents:
2943
diff
changeset
|
1028 mm.append(m[i]) |
|
5b7a118f5b6c
allow qrefresh to take a list of files; closes #96.
Brendan Cully <brendan@kublai.com>
parents:
2943
diff
changeset
|
1029 del m[i] |
|
2881
3d6efcbbd1c9
remove localrepository.changes.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2880
diff
changeset
|
1030 repo.dirstate.update(m, 'n') |
|
2944
5b7a118f5b6c
allow qrefresh to take a list of files; closes #96.
Brendan Cully <brendan@kublai.com>
parents:
2943
diff
changeset
|
1031 repo.dirstate.update(mm, 'n', st_mtime=0) |
| 1808 | 1032 repo.dirstate.forget(forget) |
| 1033 | |
|
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1034 if not msg: |
|
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1035 if not message: |
|
3033
a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents:
3014
diff
changeset
|
1036 message = "patch queue: %s\n" % patchfn |
|
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1037 else: |
|
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1038 message = "\n".join(message) |
| 1808 | 1039 else: |
|
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1040 message = msg |
|
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1041 |
| 1808 | 1042 self.strip(repo, top, update=False, backup='strip', wlock=wlock) |
| 1043 n = repo.commit(filelist, message, changes[1], force=1, wlock=wlock) | |
|
3033
a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents:
3014
diff
changeset
|
1044 self.applied[-1] = statusentry(revlog.hex(n), patchfn) |
| 1808 | 1045 self.applied_dirty = 1 |
| 1046 else: | |
|
2880
4ec58b157265
refactor text diff/patch code.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2879
diff
changeset
|
1047 self.printdiff(repo, patchparent, fp=patchf) |
| 1808 | 1048 patchf.close() |
| 1049 self.pop(repo, force=True, wlock=wlock) | |
| 1050 self.push(repo, force=True, wlock=wlock) | |
| 1051 | |
| 1052 def init(self, repo, create=False): | |
| 1053 if os.path.isdir(self.path): | |
|
2712
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2711
diff
changeset
|
1054 raise util.Abort(_("patch queue directory already exists")) |
| 1808 | 1055 os.mkdir(self.path) |
| 1056 if create: | |
| 1057 return self.qrepo(create=True) | |
| 1058 | |
| 1059 def unapplied(self, repo, patch=None): | |
| 1060 if patch and patch not in self.series: | |
|
2712
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2711
diff
changeset
|
1061 raise util.Abort(_("patch %s is not in series file") % patch) |
| 1808 | 1062 if not patch: |
| 1063 start = self.series_end() | |
| 1064 else: | |
| 1065 start = self.series.index(patch) + 1 | |
|
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1066 unapplied = [] |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1067 for i in xrange(start, len(self.series)): |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1068 pushable, reason = self.pushable(i) |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1069 if pushable: |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1070 unapplied.append((i, self.series[i])) |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1071 self.explain_pushable(i) |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1072 return unapplied |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1073 |
|
3189
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1074 def qseries(self, repo, missing=None, start=0, length=0, status=None, |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1075 summary=False): |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1076 def displayname(patchname): |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1077 if summary: |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1078 msg = self.readheaders(patchname)[0] |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1079 msg = msg and ': ' + msg[0] or ': ' |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1080 else: |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1081 msg = '' |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1082 return '%s%s' % (patchname, msg) |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1083 |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1084 def pname(i): |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1085 if status == 'A': |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1086 return self.applied[i].name |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1087 else: |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1088 return self.series[i] |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1089 |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1090 unapplied = self.series_end(all_patches=True) |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1091 if not length: |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1092 length = len(self.series) - start |
| 1808 | 1093 if not missing: |
|
3189
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1094 for i in range(start, start+length): |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1095 pfx = '' |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1096 patch = pname(i) |
| 1808 | 1097 if self.ui.verbose: |
|
3189
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1098 if i < unapplied: |
|
2756
caa6d992608b
Add -s option to qseries: display first line of patch header.
Brendan Cully <brendan@kublai.com>
parents:
2754
diff
changeset
|
1099 status = 'A' |
|
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1100 elif self.pushable(i)[0]: |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1101 status = 'U' |
|
2756
caa6d992608b
Add -s option to qseries: display first line of patch header.
Brendan Cully <brendan@kublai.com>
parents:
2754
diff
changeset
|
1102 else: |
|
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1103 status = 'G' |
|
3189
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1104 pfx = '%d %s ' % (i, status) |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1105 self.ui.write('%s%s\n' % (pfx, displayname(patch))) |
| 1808 | 1106 else: |
|
2794
86c54b7cd331
mq: fix variables shadowing builtin
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2792
diff
changeset
|
1107 msng_list = [] |
| 1808 | 1108 for root, dirs, files in os.walk(self.path): |
| 1109 d = root[len(self.path) + 1:] | |
| 1110 for f in files: | |
| 1111 fl = os.path.join(d, f) | |
|
1852
fdf9cbf56ec7
Fix mq's usage of opener, which don't allow absolute paths now.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1839
diff
changeset
|
1112 if (fl not in self.series and |
|
fdf9cbf56ec7
Fix mq's usage of opener, which don't allow absolute paths now.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1839
diff
changeset
|
1113 fl not in (self.status_path, self.series_path) |
|
fdf9cbf56ec7
Fix mq's usage of opener, which don't allow absolute paths now.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1839
diff
changeset
|
1114 and not fl.startswith('.')): |
|
2794
86c54b7cd331
mq: fix variables shadowing builtin
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2792
diff
changeset
|
1115 msng_list.append(fl) |
|
86c54b7cd331
mq: fix variables shadowing builtin
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2792
diff
changeset
|
1116 msng_list.sort() |
|
2795
e5e23cae6e09
mq: remove unecessary test
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2794
diff
changeset
|
1117 for x in msng_list: |
|
3189
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1118 pfx = self.ui.verbose and ('D ') or '' |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1119 self.ui.write("%s%s\n" % (pfx, displayname(x))) |
| 1808 | 1120 |
| 1121 def issaveline(self, l): | |
|
2816
52516e48e3f3
Update qsave to use StatusEntry; don't throw exception on bad status lines.
Brendan Cully <brendan@kublai.com>
parents:
2804
diff
changeset
|
1122 if l.name == '.hg.patches.save.line': |
| 1808 | 1123 return True |
| 1124 | |
| 1125 def qrepo(self, create=False): | |
| 2819 | 1126 if create or os.path.isdir(self.join(".hg")): |
|
1839
876e4e6ad82b
Create local ui object per repository, so .hg/hgrc don't get mixed.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1810
diff
changeset
|
1127 return hg.repository(self.ui, path=self.path, create=create) |
| 1808 | 1128 |
| 1129 def restore(self, repo, rev, delete=None, qupdate=None): | |
| 1130 c = repo.changelog.read(rev) | |
| 1131 desc = c[4].strip() | |
| 1132 lines = desc.splitlines() | |
| 1133 i = 0 | |
| 1134 datastart = None | |
| 1135 series = [] | |
| 1136 applied = [] | |
| 1137 qpp = None | |
| 1138 for i in xrange(0, len(lines)): | |
| 1139 if lines[i] == 'Patch Data:': | |
| 1140 datastart = i + 1 | |
| 1141 elif lines[i].startswith('Dirstate:'): | |
| 1142 l = lines[i].rstrip() | |
| 1143 l = l[10:].split(' ') | |
| 1144 qpp = [ hg.bin(x) for x in l ] | |
| 1145 elif datastart != None: | |
| 1146 l = lines[i].rstrip() | |
|
2818
bdc067ff6cf5
Make mq camelcase consistent with the rest of hg.
Brendan Cully <brendan@kublai.com>
parents:
2816
diff
changeset
|
1147 se = statusentry(l) |
|
2794
86c54b7cd331
mq: fix variables shadowing builtin
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2792
diff
changeset
|
1148 file_ = se.name |
|
86c54b7cd331
mq: fix variables shadowing builtin
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2792
diff
changeset
|
1149 if se.rev: |
|
2780
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
1150 applied.append(se) |
|
2794
86c54b7cd331
mq: fix variables shadowing builtin
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2792
diff
changeset
|
1151 series.append(file_) |
| 1808 | 1152 if datastart == None: |
| 1153 self.ui.warn("No saved patch data found\n") | |
| 1154 return 1 | |
| 1155 self.ui.warn("restoring status: %s\n" % lines[0]) | |
| 1156 self.full_series = series | |
| 1157 self.applied = applied | |
|
2767
60683ab1ed33
mq: rename read_series as parse_series, make simpler and faster
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2766
diff
changeset
|
1158 self.parse_series() |
| 1808 | 1159 self.series_dirty = 1 |
| 1160 self.applied_dirty = 1 | |
| 1161 heads = repo.changelog.heads() | |
| 1162 if delete: | |
| 1163 if rev not in heads: | |
| 1164 self.ui.warn("save entry has children, leaving it alone\n") | |
| 1165 else: | |
| 1166 self.ui.warn("removing save entry %s\n" % hg.short(rev)) | |
| 1167 pp = repo.dirstate.parents() | |
| 1168 if rev in pp: | |
| 1169 update = True | |
| 1170 else: | |
| 1171 update = False | |
| 1172 self.strip(repo, rev, update=update, backup='strip') | |
| 1173 if qpp: | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1174 self.ui.warn("saved queue repository parents: %s %s\n" % |
| 1808 | 1175 (hg.short(qpp[0]), hg.short(qpp[1]))) |
| 1176 if qupdate: | |
| 1177 print "queue directory updating" | |
| 1178 r = self.qrepo() | |
| 1179 if not r: | |
| 1180 self.ui.warn("Unable to load queue repository\n") | |
| 1181 return 1 | |
|
2808
30f59f4a327e
Introduce update helper functions: update, merge, clean, and revert
Matt Mackall <mpm@selenic.com>
parents:
2804
diff
changeset
|
1182 hg.clean(r, qpp[0]) |
| 1808 | 1183 |
| 1184 def save(self, repo, msg=None): | |
| 1185 if len(self.applied) == 0: | |
| 1186 self.ui.warn("save: no patches applied, exiting\n") | |
| 1187 return 1 | |
| 1188 if self.issaveline(self.applied[-1]): | |
| 1189 self.ui.warn("status is already saved\n") | |
| 1190 return 1 | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1191 |
| 1808 | 1192 ar = [ ':' + x for x in self.full_series ] |
| 1193 if not msg: | |
| 1194 msg = "hg patches saved state" | |
| 1195 else: | |
| 1196 msg = "hg patches: " + msg.rstrip('\r\n') | |
| 1197 r = self.qrepo() | |
| 1198 if r: | |
| 1199 pp = r.dirstate.parents() | |
| 1200 msg += "\nDirstate: %s %s" % (hg.hex(pp[0]), hg.hex(pp[1])) | |
| 1201 msg += "\n\nPatch Data:\n" | |
|
2816
52516e48e3f3
Update qsave to use StatusEntry; don't throw exception on bad status lines.
Brendan Cully <brendan@kublai.com>
parents:
2804
diff
changeset
|
1202 text = msg + "\n".join([str(x) for x in self.applied]) + '\n' + (ar and |
|
52516e48e3f3
Update qsave to use StatusEntry; don't throw exception on bad status lines.
Brendan Cully <brendan@kublai.com>
parents:
2804
diff
changeset
|
1203 "\n".join(ar) + '\n' or "") |
| 1808 | 1204 n = repo.commit(None, text, user=None, force=1) |
| 1205 if not n: | |
| 1206 self.ui.warn("repo commit failed\n") | |
| 1207 return 1 | |
|
2818
bdc067ff6cf5
Make mq camelcase consistent with the rest of hg.
Brendan Cully <brendan@kublai.com>
parents:
2816
diff
changeset
|
1208 self.applied.append(statusentry(revlog.hex(n),'.hg.patches.save.line')) |
| 1808 | 1209 self.applied_dirty = 1 |
| 1210 | |
|
2698
c1123e83c8e2
mq: fix qnew and qimport to deal with series file comments
Chris Mason <mason@suse.com>
parents:
2697
diff
changeset
|
1211 def full_series_end(self): |
|
c1123e83c8e2
mq: fix qnew and qimport to deal with series file comments
Chris Mason <mason@suse.com>
parents:
2697
diff
changeset
|
1212 if len(self.applied) > 0: |
|
2780
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
1213 p = self.applied[-1].name |
|
2698
c1123e83c8e2
mq: fix qnew and qimport to deal with series file comments
Chris Mason <mason@suse.com>
parents:
2697
diff
changeset
|
1214 end = self.find_series(p) |
|
c1123e83c8e2
mq: fix qnew and qimport to deal with series file comments
Chris Mason <mason@suse.com>
parents:
2697
diff
changeset
|
1215 if end == None: |
|
c1123e83c8e2
mq: fix qnew and qimport to deal with series file comments
Chris Mason <mason@suse.com>
parents:
2697
diff
changeset
|
1216 return len(self.full_series) |
|
c1123e83c8e2
mq: fix qnew and qimport to deal with series file comments
Chris Mason <mason@suse.com>
parents:
2697
diff
changeset
|
1217 return end + 1 |
|
c1123e83c8e2
mq: fix qnew and qimport to deal with series file comments
Chris Mason <mason@suse.com>
parents:
2697
diff
changeset
|
1218 return 0 |
|
c1123e83c8e2
mq: fix qnew and qimport to deal with series file comments
Chris Mason <mason@suse.com>
parents:
2697
diff
changeset
|
1219 |
|
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1220 def series_end(self, all_patches=False): |
| 1808 | 1221 end = 0 |
|
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1222 def next(start): |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1223 if all_patches: |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1224 return start |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1225 i = start |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1226 while i < len(self.series): |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1227 p, reason = self.pushable(i) |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1228 if p: |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1229 break |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1230 self.explain_pushable(i) |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1231 i += 1 |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1232 return i |
| 1808 | 1233 if len(self.applied) > 0: |
|
2780
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
1234 p = self.applied[-1].name |
| 1808 | 1235 try: |
| 1236 end = self.series.index(p) | |
| 1237 except ValueError: | |
| 1238 return 0 | |
|
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1239 return next(end + 1) |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1240 return next(end) |
| 1808 | 1241 |
| 1242 def appliedname(self, index): | |
|
2780
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
1243 pname = self.applied[index].name |
| 1808 | 1244 if not self.ui.verbose: |
|
2677
ec05ce9cbf47
mq: uniform verbose display of patche[s].
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2664
diff
changeset
|
1245 p = pname |
|
ec05ce9cbf47
mq: uniform verbose display of patche[s].
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2664
diff
changeset
|
1246 else: |
| 2947 | 1247 p = str(self.series.index(pname)) + " " + pname |
| 1808 | 1248 return p |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1249 |
|
3147
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1250 def qimport(self, repo, files, patchname=None, rev=None, existing=None, |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1251 force=None): |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1252 def checkseries(patchname): |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1253 if patchname in self.series: |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1254 raise util.Abort(_('patch %s is already in the series file') |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1255 % patchname) |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1256 def checkfile(patchname): |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1257 if not force and os.path.exists(self.join(patchname)): |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1258 raise util.Abort(_('patch "%s" already exists') |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1259 % patchname) |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1260 |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1261 if rev: |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1262 if files: |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1263 raise util.Abort(_('option "-r" not valid when importing ' |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1264 'files')) |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1265 rev = [int(r) for r in cmdutil.revrange(self.ui, repo, rev)] |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1266 rev.sort(lambda x, y: cmp(y, x)) |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1267 if (len(files) > 1 or len(rev) > 1) and patchname: |
|
2712
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2711
diff
changeset
|
1268 raise util.Abort(_('option "-n" not valid when importing multiple ' |
|
3147
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1269 'patches')) |
| 1808 | 1270 i = 0 |
|
2488
2785aeb51be4
mq: add qimported patches if patch dir is a repo
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2301
diff
changeset
|
1271 added = [] |
|
3147
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1272 if rev: |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1273 # If mq patches are applied, we can only import revisions |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1274 # that form a linear path to qbase. |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1275 # Otherwise, they should form a linear path to a head. |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1276 heads = repo.changelog.heads(repo.changelog.node(rev[-1])) |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1277 if len(heads) > 1: |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1278 raise util.Abort(_('revision %d is the root of more than one ' |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1279 'branch') % rev[-1]) |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1280 if self.applied: |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1281 base = revlog.hex(repo.changelog.node(rev[0])) |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1282 if base in [n.rev for n in self.applied]: |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1283 raise util.Abort(_('revision %d is already managed') |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1284 % rev[0]) |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1285 if heads != [revlog.bin(self.applied[-1].rev)]: |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1286 raise util.Abort(_('revision %d is not the parent of ' |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1287 'the queue') % rev[0]) |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1288 base = repo.changelog.rev(revlog.bin(self.applied[0].rev)) |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1289 lastparent = repo.changelog.parentrevs(base)[0] |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1290 else: |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1291 if heads != [repo.changelog.node(rev[0])]: |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1292 raise util.Abort(_('revision %d has unmanaged children') |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1293 % rev[0]) |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1294 lastparent = None |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1295 |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1296 for r in rev: |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1297 p1, p2 = repo.changelog.parentrevs(r) |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1298 n = repo.changelog.node(r) |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1299 if p2 != -1: |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1300 raise util.Abort(_('cannot import merge revision %d') % r) |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1301 if lastparent and lastparent != r: |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1302 raise util.Abort(_('revision %d is not the parent of %d') |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1303 % (r, lastparent)) |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1304 lastparent = p1 |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1305 |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1306 if not patchname: |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1307 patchname = '%d.diff' % r |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1308 checkseries(patchname) |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1309 checkfile(patchname) |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1310 self.full_series.insert(0, patchname) |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1311 |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1312 patchf = self.opener(patchname, "w") |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1313 patch.export(repo, [n], fp=patchf, opts=self.diffopts()) |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1314 patchf.close() |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1315 |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1316 se = statusentry(revlog.hex(n), patchname) |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1317 self.applied.insert(0, se) |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1318 |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1319 added.append(patchname) |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1320 patchname = None |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1321 self.parse_series() |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1322 self.applied_dirty = 1 |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1323 |
| 1808 | 1324 for filename in files: |
| 1325 if existing: | |
|
3139
15fde1970003
qimport: rename patch to patchname to avoid shadowing module
Brendan Cully <brendan@kublai.com>
parents:
3097
diff
changeset
|
1326 if not patchname: |
|
15fde1970003
qimport: rename patch to patchname to avoid shadowing module
Brendan Cully <brendan@kublai.com>
parents:
3097
diff
changeset
|
1327 patchname = filename |
|
15fde1970003
qimport: rename patch to patchname to avoid shadowing module
Brendan Cully <brendan@kublai.com>
parents:
3097
diff
changeset
|
1328 if not os.path.isfile(self.join(patchname)): |
|
15fde1970003
qimport: rename patch to patchname to avoid shadowing module
Brendan Cully <brendan@kublai.com>
parents:
3097
diff
changeset
|
1329 raise util.Abort(_("patch %s does not exist") % patchname) |
| 1808 | 1330 else: |
| 1331 try: | |
| 1332 text = file(filename).read() | |
| 1333 except IOError: | |
|
3139
15fde1970003
qimport: rename patch to patchname to avoid shadowing module
Brendan Cully <brendan@kublai.com>
parents:
3097
diff
changeset
|
1334 raise util.Abort(_("unable to read %s") % patchname) |
|
15fde1970003
qimport: rename patch to patchname to avoid shadowing module
Brendan Cully <brendan@kublai.com>
parents:
3097
diff
changeset
|
1335 if not patchname: |
|
15fde1970003
qimport: rename patch to patchname to avoid shadowing module
Brendan Cully <brendan@kublai.com>
parents:
3097
diff
changeset
|
1336 patchname = os.path.basename(filename) |
|
3147
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1337 checkfile(patchname) |
|
3139
15fde1970003
qimport: rename patch to patchname to avoid shadowing module
Brendan Cully <brendan@kublai.com>
parents:
3097
diff
changeset
|
1338 patchf = self.opener(patchname, "w") |
| 1808 | 1339 patchf.write(text) |
|
3147
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1340 checkseries(patchname) |
|
2698
c1123e83c8e2
mq: fix qnew and qimport to deal with series file comments
Chris Mason <mason@suse.com>
parents:
2697
diff
changeset
|
1341 index = self.full_series_end() + i |
|
3139
15fde1970003
qimport: rename patch to patchname to avoid shadowing module
Brendan Cully <brendan@kublai.com>
parents:
3097
diff
changeset
|
1342 self.full_series[index:index] = [patchname] |
|
2767
60683ab1ed33
mq: rename read_series as parse_series, make simpler and faster
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2766
diff
changeset
|
1343 self.parse_series() |
|
3139
15fde1970003
qimport: rename patch to patchname to avoid shadowing module
Brendan Cully <brendan@kublai.com>
parents:
3097
diff
changeset
|
1344 self.ui.warn("adding %s to series file\n" % patchname) |
| 1808 | 1345 i += 1 |
|
3139
15fde1970003
qimport: rename patch to patchname to avoid shadowing module
Brendan Cully <brendan@kublai.com>
parents:
3097
diff
changeset
|
1346 added.append(patchname) |
|
15fde1970003
qimport: rename patch to patchname to avoid shadowing module
Brendan Cully <brendan@kublai.com>
parents:
3097
diff
changeset
|
1347 patchname = None |
| 1808 | 1348 self.series_dirty = 1 |
|
2488
2785aeb51be4
mq: add qimported patches if patch dir is a repo
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2301
diff
changeset
|
1349 qrepo = self.qrepo() |
|
2785aeb51be4
mq: add qimported patches if patch dir is a repo
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2301
diff
changeset
|
1350 if qrepo: |
|
2785aeb51be4
mq: add qimported patches if patch dir is a repo
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2301
diff
changeset
|
1351 qrepo.add(added) |
| 1808 | 1352 |
|
2911
790fd342b6c7
Allow qdel to delete multiple patches.
Brendan Cully <brendan@kublai.com>
parents:
2910
diff
changeset
|
1353 def delete(ui, repo, patch, *patches, **opts): |
|
790fd342b6c7
Allow qdel to delete multiple patches.
Brendan Cully <brendan@kublai.com>
parents:
2910
diff
changeset
|
1354 """remove patches from queue |
|
2752
5dfeda163bb7
Add -f option to qdelete, to remove patch file.
Brendan Cully <brendan@kublai.com>
parents:
2751
diff
changeset
|
1355 |
|
3094
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
3093
diff
changeset
|
1356 With --forget, mq will stop managing the named patches. The |
|
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
3093
diff
changeset
|
1357 patches must be applied and at the base of the stack. This option |
|
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
3093
diff
changeset
|
1358 is useful when the patches have been applied upstream. |
|
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
3093
diff
changeset
|
1359 |
|
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
3093
diff
changeset
|
1360 Otherwise, the patches must not be applied. |
|
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
3093
diff
changeset
|
1361 |
|
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
3093
diff
changeset
|
1362 With --keep, the patch files are preserved in the patch directory.""" |
|
2724
9c41ae1908c7
mq: replace module-wide repo hash with a repo attribute
Brendan Cully <brendan@kublai.com>
parents:
2723
diff
changeset
|
1363 q = repo.mq |
|
3094
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
3093
diff
changeset
|
1364 q.delete(repo, (patch,) + patches, opts) |
| 1808 | 1365 q.save_dirty() |
| 1366 return 0 | |
| 1367 | |
| 1368 def applied(ui, repo, patch=None, **opts): | |
| 1369 """print the patches already applied""" | |
|
3189
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1370 q = repo.mq |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1371 if patch: |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1372 if patch not in q.series: |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1373 raise util.Abort(_("patch %s is not in series file") % patch) |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1374 end = q.series.index(patch) + 1 |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1375 else: |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1376 end = len(q.applied) |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1377 return q.qseries(repo, length=end, status='A', summary=opts.get('summary')) |
| 1808 | 1378 |
| 1379 def unapplied(ui, repo, patch=None, **opts): | |
| 1380 """print the patches not yet applied""" | |
|
3189
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1381 q = repo.mq |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1382 if patch: |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1383 if patch not in q.series: |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1384 raise util.Abort(_("patch %s is not in series file") % patch) |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1385 start = q.series.index(patch) + 1 |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1386 else: |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1387 start = q.series_end() |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1388 q.qseries(repo, start=start, summary=opts.get('summary')) |
| 1808 | 1389 |
| 1390 def qimport(ui, repo, *filename, **opts): | |
|
3147
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1391 """import a patch |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1392 |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1393 The patch will have the same name as its source file unless you |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1394 give it a new one with --name. |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1395 |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1396 You can register an existing patch inside the patch directory |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1397 with the --existing flag. |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1398 |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1399 With --force, an existing patch of the same name will be overwritten. |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1400 |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1401 An existing changeset may be placed under mq control with --rev |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1402 (e.g. qimport --rev tip -n patch will place tip under mq control). |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1403 """ |
|
2724
9c41ae1908c7
mq: replace module-wide repo hash with a repo attribute
Brendan Cully <brendan@kublai.com>
parents:
2723
diff
changeset
|
1404 q = repo.mq |
|
3139
15fde1970003
qimport: rename patch to patchname to avoid shadowing module
Brendan Cully <brendan@kublai.com>
parents:
3097
diff
changeset
|
1405 q.qimport(repo, filename, patchname=opts['name'], |
|
3147
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
1406 existing=opts['existing'], force=opts['force'], rev=opts['rev']) |
| 1808 | 1407 q.save_dirty() |
| 1408 return 0 | |
| 1409 | |
| 1410 def init(ui, repo, **opts): | |
|
2754
19041b8cbc86
Add more verbose help text to mq commands.
Brendan Cully <brendan@kublai.com>
parents:
2753
diff
changeset
|
1411 """init a new queue repository |
|
19041b8cbc86
Add more verbose help text to mq commands.
Brendan Cully <brendan@kublai.com>
parents:
2753
diff
changeset
|
1412 |
|
19041b8cbc86
Add more verbose help text to mq commands.
Brendan Cully <brendan@kublai.com>
parents:
2753
diff
changeset
|
1413 The queue repository is unversioned by default. If -c is |
|
19041b8cbc86
Add more verbose help text to mq commands.
Brendan Cully <brendan@kublai.com>
parents:
2753
diff
changeset
|
1414 specified, qinit will create a separate nested repository |
|
19041b8cbc86
Add more verbose help text to mq commands.
Brendan Cully <brendan@kublai.com>
parents:
2753
diff
changeset
|
1415 for patches. Use qcommit to commit changes to this queue |
|
19041b8cbc86
Add more verbose help text to mq commands.
Brendan Cully <brendan@kublai.com>
parents:
2753
diff
changeset
|
1416 repository.""" |
|
2724
9c41ae1908c7
mq: replace module-wide repo hash with a repo attribute
Brendan Cully <brendan@kublai.com>
parents:
2723
diff
changeset
|
1417 q = repo.mq |
| 1808 | 1418 r = q.init(repo, create=opts['create_repo']) |
| 1419 q.save_dirty() | |
| 1420 if r: | |
| 1421 fp = r.wopener('.hgignore', 'w') | |
| 1422 print >> fp, 'syntax: glob' | |
| 1423 print >> fp, 'status' | |
| 1424 fp.close() | |
| 1425 r.wopener('series', 'w').close() | |
| 1426 r.add(['.hgignore', 'series']) | |
| 1427 return 0 | |
| 1428 | |
|
2720
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2713
diff
changeset
|
1429 def clone(ui, source, dest=None, **opts): |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2713
diff
changeset
|
1430 '''clone main and patch repository at same time |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2713
diff
changeset
|
1431 |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2713
diff
changeset
|
1432 If source is local, destination will have no patches applied. If |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2713
diff
changeset
|
1433 source is remote, this command can not check if patches are |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2713
diff
changeset
|
1434 applied in source, so cannot guarantee that patches are not |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2713
diff
changeset
|
1435 applied in destination. If you clone remote repository, be sure |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2713
diff
changeset
|
1436 before that it has no patches applied. |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2713
diff
changeset
|
1437 |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2713
diff
changeset
|
1438 Source patch repository is looked for in <src>/.hg/patches by |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2713
diff
changeset
|
1439 default. Use -p <url> to change. |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2713
diff
changeset
|
1440 ''' |
|
2766
c5ac397f7671
fix call to commands.setremoteconfig
Bryan O'Sullivan <bos@serpentine.com>
parents:
2765
diff
changeset
|
1441 commands.setremoteconfig(ui, opts) |
|
2720
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2713
diff
changeset
|
1442 if dest is None: |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2713
diff
changeset
|
1443 dest = hg.defaultdest(source) |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2713
diff
changeset
|
1444 sr = hg.repository(ui, ui.expandpath(source)) |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2713
diff
changeset
|
1445 qbase, destrev = None, None |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2713
diff
changeset
|
1446 if sr.local(): |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2713
diff
changeset
|
1447 reposetup(ui, sr) |
|
2725
9ffee4f07323
mq: update to handle repomap not longer used
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2724
diff
changeset
|
1448 if sr.mq.applied: |
|
2780
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
1449 qbase = revlog.bin(sr.mq.applied[0].rev) |
|
2720
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2713
diff
changeset
|
1450 if not hg.islocal(dest): |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2713
diff
changeset
|
1451 destrev = sr.parents(qbase)[0] |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2713
diff
changeset
|
1452 ui.note(_('cloning main repo\n')) |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2713
diff
changeset
|
1453 sr, dr = hg.clone(ui, sr, dest, |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2713
diff
changeset
|
1454 pull=opts['pull'], |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2713
diff
changeset
|
1455 rev=destrev, |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2713
diff
changeset
|
1456 update=False, |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2713
diff
changeset
|
1457 stream=opts['uncompressed']) |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2713
diff
changeset
|
1458 ui.note(_('cloning patch repo\n')) |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2713
diff
changeset
|
1459 spr, dpr = hg.clone(ui, opts['patches'] or (sr.url() + '/.hg/patches'), |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2713
diff
changeset
|
1460 dr.url() + '/.hg/patches', |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2713
diff
changeset
|
1461 pull=opts['pull'], |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2713
diff
changeset
|
1462 update=not opts['noupdate'], |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2713
diff
changeset
|
1463 stream=opts['uncompressed']) |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2713
diff
changeset
|
1464 if dr.local(): |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2713
diff
changeset
|
1465 if qbase: |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2713
diff
changeset
|
1466 ui.note(_('stripping applied patches from destination repo\n')) |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2713
diff
changeset
|
1467 reposetup(ui, dr) |
|
2725
9ffee4f07323
mq: update to handle repomap not longer used
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2724
diff
changeset
|
1468 dr.mq.strip(dr, qbase, update=False, backup=None) |
|
2720
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2713
diff
changeset
|
1469 if not opts['noupdate']: |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2713
diff
changeset
|
1470 ui.note(_('updating destination repo\n')) |
|
2775
b550cd82f92a
Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
2772
diff
changeset
|
1471 hg.update(dr, dr.changelog.tip()) |
|
2720
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2713
diff
changeset
|
1472 |
| 1808 | 1473 def commit(ui, repo, *pats, **opts): |
|
2526
37785f986260
mq: Added help for qcommit, consistently talk about queue repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2488
diff
changeset
|
1474 """commit changes in the queue repository""" |
|
2724
9c41ae1908c7
mq: replace module-wide repo hash with a repo attribute
Brendan Cully <brendan@kublai.com>
parents:
2723
diff
changeset
|
1475 q = repo.mq |
| 1808 | 1476 r = q.qrepo() |
| 1477 if not r: raise util.Abort('no queue repository') | |
| 1478 commands.commit(r.ui, r, *pats, **opts) | |
| 1479 | |
| 1480 def series(ui, repo, **opts): | |
| 1481 """print the entire series file""" | |
|
2756
caa6d992608b
Add -s option to qseries: display first line of patch header.
Brendan Cully <brendan@kublai.com>
parents:
2754
diff
changeset
|
1482 repo.mq.qseries(repo, missing=opts['missing'], summary=opts['summary']) |
| 1808 | 1483 return 0 |
| 1484 | |
| 1485 def top(ui, repo, **opts): | |
| 1486 """print the name of the current patch""" | |
|
3189
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1487 q = repo.mq |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1488 t = len(q.applied) |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1489 if t: |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1490 return q.qseries(repo, start=t-1, length=1, status='A', |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1491 summary=opts.get('summary')) |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1492 else: |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1493 ui.write("No patches applied\n") |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1494 return 1 |
| 1808 | 1495 |
| 1496 def next(ui, repo, **opts): | |
| 1497 """print the name of the next patch""" | |
|
3189
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1498 q = repo.mq |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1499 end = q.series_end() |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1500 if end == len(q.series): |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1501 ui.write("All patches applied\n") |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1502 return 1 |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1503 return q.qseries(repo, start=end, length=1, summary=opts.get('summary')) |
| 1808 | 1504 |
| 1505 def prev(ui, repo, **opts): | |
| 1506 """print the name of the previous patch""" | |
|
3189
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1507 q = repo.mq |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1508 l = len(q.applied) |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1509 if l == 1: |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1510 ui.write("Only one patch applied\n") |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1511 return 1 |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1512 if not l: |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1513 ui.write("No patches applied\n") |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1514 return 1 |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1515 return q.qseries(repo, start=l-2, length=1, status='A', |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1516 summary=opts.get('summary')) |
| 1808 | 1517 |
| 1518 def new(ui, repo, patch, **opts): | |
|
2754
19041b8cbc86
Add more verbose help text to mq commands.
Brendan Cully <brendan@kublai.com>
parents:
2753
diff
changeset
|
1519 """create a new patch |
|
19041b8cbc86
Add more verbose help text to mq commands.
Brendan Cully <brendan@kublai.com>
parents:
2753
diff
changeset
|
1520 |
|
19041b8cbc86
Add more verbose help text to mq commands.
Brendan Cully <brendan@kublai.com>
parents:
2753
diff
changeset
|
1521 qnew creates a new patch on top of the currently-applied patch |
|
19041b8cbc86
Add more verbose help text to mq commands.
Brendan Cully <brendan@kublai.com>
parents:
2753
diff
changeset
|
1522 (if any). It will refuse to run if there are any outstanding |
|
19041b8cbc86
Add more verbose help text to mq commands.
Brendan Cully <brendan@kublai.com>
parents:
2753
diff
changeset
|
1523 changes unless -f is specified, in which case the patch will |
|
19041b8cbc86
Add more verbose help text to mq commands.
Brendan Cully <brendan@kublai.com>
parents:
2753
diff
changeset
|
1524 be initialised with them. |
|
19041b8cbc86
Add more verbose help text to mq commands.
Brendan Cully <brendan@kublai.com>
parents:
2753
diff
changeset
|
1525 |
| 2945 | 1526 -e, -m or -l set the patch header as well as the commit message. |
| 1527 If none is specified, the patch header is empty and the | |
|
2770
5f8259e4d292
Clean up qnew help text.
Brendan Cully <brendan@kublai.com>
parents:
2767
diff
changeset
|
1528 commit message is 'New patch: PATCH'""" |
|
2724
9c41ae1908c7
mq: replace module-wide repo hash with a repo attribute
Brendan Cully <brendan@kublai.com>
parents:
2723
diff
changeset
|
1529 q = repo.mq |
|
2804
4b20daa25f15
Update mq to use new logmessage arglist from 2794:bd8a9a94139f
Brendan Cully <brendan@kublai.com>
parents:
2803
diff
changeset
|
1530 message = commands.logmessage(opts) |
| 2945 | 1531 if opts['edit']: |
| 1532 message = ui.edit(message, ui.username()) | |
|
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1533 q.new(repo, patch, msg=message, force=opts['force']) |
| 1808 | 1534 q.save_dirty() |
| 1535 return 0 | |
| 1536 | |
|
2944
5b7a118f5b6c
allow qrefresh to take a list of files; closes #96.
Brendan Cully <brendan@kublai.com>
parents:
2943
diff
changeset
|
1537 def refresh(ui, repo, *pats, **opts): |
|
2946
b1e6d701a03a
mq help text updates and speling fixes
Brendan Cully <brendan@kublai.com>
parents:
2945
diff
changeset
|
1538 """update the current patch |
|
b1e6d701a03a
mq help text updates and speling fixes
Brendan Cully <brendan@kublai.com>
parents:
2945
diff
changeset
|
1539 |
|
b1e6d701a03a
mq help text updates and speling fixes
Brendan Cully <brendan@kublai.com>
parents:
2945
diff
changeset
|
1540 If any file patterns are provided, the refreshed patch will contain only |
|
b1e6d701a03a
mq help text updates and speling fixes
Brendan Cully <brendan@kublai.com>
parents:
2945
diff
changeset
|
1541 the modifications that match those patterns; the remaining modifications |
|
b1e6d701a03a
mq help text updates and speling fixes
Brendan Cully <brendan@kublai.com>
parents:
2945
diff
changeset
|
1542 will remain in the working directory. |
|
b1e6d701a03a
mq help text updates and speling fixes
Brendan Cully <brendan@kublai.com>
parents:
2945
diff
changeset
|
1543 """ |
|
2724
9c41ae1908c7
mq: replace module-wide repo hash with a repo attribute
Brendan Cully <brendan@kublai.com>
parents:
2723
diff
changeset
|
1544 q = repo.mq |
|
2804
4b20daa25f15
Update mq to use new logmessage arglist from 2794:bd8a9a94139f
Brendan Cully <brendan@kublai.com>
parents:
2803
diff
changeset
|
1545 message = commands.logmessage(opts) |
|
2746
0503eb5c0a33
Add option -e/--edit to qrefresh, to edit the existing header.
Brendan Cully <brendan@kublai.com>
parents:
2745
diff
changeset
|
1546 if opts['edit']: |
|
0503eb5c0a33
Add option -e/--edit to qrefresh, to edit the existing header.
Brendan Cully <brendan@kublai.com>
parents:
2745
diff
changeset
|
1547 if message: |
|
0503eb5c0a33
Add option -e/--edit to qrefresh, to edit the existing header.
Brendan Cully <brendan@kublai.com>
parents:
2745
diff
changeset
|
1548 raise util.Abort(_('option "-e" incompatible with "-m" or "-l"')) |
|
2780
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
1549 patch = q.applied[-1].name |
|
2746
0503eb5c0a33
Add option -e/--edit to qrefresh, to edit the existing header.
Brendan Cully <brendan@kublai.com>
parents:
2745
diff
changeset
|
1550 (message, comment, user, date, hasdiff) = q.readheaders(patch) |
|
0503eb5c0a33
Add option -e/--edit to qrefresh, to edit the existing header.
Brendan Cully <brendan@kublai.com>
parents:
2745
diff
changeset
|
1551 message = ui.edit('\n'.join(message), user or ui.username()) |
|
3010
ac74046f8f58
qrefresh: exit with status 1 if no patches applied.
Bryan O'Sullivan <bos@serpentine.com>
parents:
2990
diff
changeset
|
1552 ret = q.refresh(repo, pats, msg=message, **opts) |
| 1808 | 1553 q.save_dirty() |
|
3010
ac74046f8f58
qrefresh: exit with status 1 if no patches applied.
Bryan O'Sullivan <bos@serpentine.com>
parents:
2990
diff
changeset
|
1554 return ret |
| 1808 | 1555 |
|
2943
9dc568f5e03d
Fix test-mq-qdiff; add -I and -X options to qdiff
Brendan Cully <brendan@kublai.com>
parents:
2942
diff
changeset
|
1556 def diff(ui, repo, *pats, **opts): |
| 1808 | 1557 """diff of the current patch""" |
|
2943
9dc568f5e03d
Fix test-mq-qdiff; add -I and -X options to qdiff
Brendan Cully <brendan@kublai.com>
parents:
2942
diff
changeset
|
1558 repo.mq.diff(repo, pats, opts) |
| 1808 | 1559 return 0 |
| 1560 | |
|
2753
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1561 def fold(ui, repo, *files, **opts): |
|
2748
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1562 """fold the named patches into the current patch |
|
2753
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1563 |
|
2771
519bf0cd28d2
Add -f option to qfold; improve qfold documentation.
Brendan Cully <brendan@kublai.com>
parents:
2770
diff
changeset
|
1564 Patches must not yet be applied. Each patch will be successively |
|
519bf0cd28d2
Add -f option to qfold; improve qfold documentation.
Brendan Cully <brendan@kublai.com>
parents:
2770
diff
changeset
|
1565 applied to the current patch in the order given. If all the |
|
519bf0cd28d2
Add -f option to qfold; improve qfold documentation.
Brendan Cully <brendan@kublai.com>
parents:
2770
diff
changeset
|
1566 patches apply successfully, the current patch will be refreshed |
|
519bf0cd28d2
Add -f option to qfold; improve qfold documentation.
Brendan Cully <brendan@kublai.com>
parents:
2770
diff
changeset
|
1567 with the new cumulative patch, and the folded patches will |
|
2910
57b88b86a845
Replace qdel/qfold -f option with -k/--keep.
Brendan Cully <brendan@kublai.com>
parents:
2889
diff
changeset
|
1568 be deleted. With -k/--keep, the folded patch files will not |
|
2771
519bf0cd28d2
Add -f option to qfold; improve qfold documentation.
Brendan Cully <brendan@kublai.com>
parents:
2770
diff
changeset
|
1569 be removed afterwards. |
|
519bf0cd28d2
Add -f option to qfold; improve qfold documentation.
Brendan Cully <brendan@kublai.com>
parents:
2770
diff
changeset
|
1570 |
|
2753
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1571 The header for each folded patch will be concatenated with |
|
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1572 the current patch header, separated by a line of '* * *'.""" |
|
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1573 |
|
2748
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1574 q = repo.mq |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1575 |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1576 if not files: |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1577 raise util.Abort(_('qfold requires at least one patch name')) |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1578 if not q.check_toppatch(repo): |
|
3078
bc3fe3b5b785
Never apply string formatting to generated errors with util.Abort.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3033
diff
changeset
|
1579 raise util.Abort(_('No patches applied')) |
|
2748
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1580 |
|
2804
4b20daa25f15
Update mq to use new logmessage arglist from 2794:bd8a9a94139f
Brendan Cully <brendan@kublai.com>
parents:
2803
diff
changeset
|
1581 message = commands.logmessage(opts) |
|
2753
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1582 if opts['edit']: |
|
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1583 if message: |
|
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1584 raise util.Abort(_('option "-e" incompatible with "-m" or "-l"')) |
|
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1585 |
|
2748
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1586 parent = q.lookup('qtip') |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1587 patches = [] |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1588 messages = [] |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1589 for f in files: |
|
2942
21bf8929efc8
Fix qfold after recent changes
Brendan Cully <brendan@kublai.com>
parents:
2940
diff
changeset
|
1590 p = q.lookup(f) |
|
21bf8929efc8
Fix qfold after recent changes
Brendan Cully <brendan@kublai.com>
parents:
2940
diff
changeset
|
1591 if p in patches or p == parent: |
|
21bf8929efc8
Fix qfold after recent changes
Brendan Cully <brendan@kublai.com>
parents:
2940
diff
changeset
|
1592 ui.warn(_('Skipping already folded patch %s') % p) |
|
21bf8929efc8
Fix qfold after recent changes
Brendan Cully <brendan@kublai.com>
parents:
2940
diff
changeset
|
1593 if q.isapplied(p): |
|
21bf8929efc8
Fix qfold after recent changes
Brendan Cully <brendan@kublai.com>
parents:
2940
diff
changeset
|
1594 raise util.Abort(_('qfold cannot fold already applied patch %s') % p) |
|
21bf8929efc8
Fix qfold after recent changes
Brendan Cully <brendan@kublai.com>
parents:
2940
diff
changeset
|
1595 patches.append(p) |
|
2748
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1596 |
|
2942
21bf8929efc8
Fix qfold after recent changes
Brendan Cully <brendan@kublai.com>
parents:
2940
diff
changeset
|
1597 for p in patches: |
|
2753
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1598 if not message: |
|
2942
21bf8929efc8
Fix qfold after recent changes
Brendan Cully <brendan@kublai.com>
parents:
2940
diff
changeset
|
1599 messages.append(q.readheaders(p)[0]) |
|
21bf8929efc8
Fix qfold after recent changes
Brendan Cully <brendan@kublai.com>
parents:
2940
diff
changeset
|
1600 pf = q.join(p) |
|
2748
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1601 (patchsuccess, files, fuzz) = q.patch(repo, pf) |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1602 if not patchsuccess: |
|
2942
21bf8929efc8
Fix qfold after recent changes
Brendan Cully <brendan@kublai.com>
parents:
2940
diff
changeset
|
1603 raise util.Abort(_('Error folding patch %s') % p) |
|
21bf8929efc8
Fix qfold after recent changes
Brendan Cully <brendan@kublai.com>
parents:
2940
diff
changeset
|
1604 patch.updatedir(ui, repo, files) |
|
2748
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1605 |
|
2753
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1606 if not message: |
|
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1607 message, comments, user = q.readheaders(parent)[0:3] |
|
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1608 for msg in messages: |
|
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1609 message.append('* * *') |
|
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1610 message.extend(msg) |
|
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1611 message = '\n'.join(message) |
|
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1612 |
|
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1613 if opts['edit']: |
|
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1614 message = ui.edit(message, user or ui.username()) |
|
2748
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1615 |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1616 q.refresh(repo, msg=message) |
|
2942
21bf8929efc8
Fix qfold after recent changes
Brendan Cully <brendan@kublai.com>
parents:
2940
diff
changeset
|
1617 q.delete(repo, patches, keep=opts['keep']) |
|
2748
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1618 q.save_dirty() |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1619 |
|
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1620 def guard(ui, repo, *args, **opts): |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1621 '''set or print guards for a patch |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1622 |
|
2946
b1e6d701a03a
mq help text updates and speling fixes
Brendan Cully <brendan@kublai.com>
parents:
2945
diff
changeset
|
1623 Guards control whether a patch can be pushed. A patch with no |
|
b1e6d701a03a
mq help text updates and speling fixes
Brendan Cully <brendan@kublai.com>
parents:
2945
diff
changeset
|
1624 guards is always pushed. A patch with a positive guard ("+foo") is |
|
b1e6d701a03a
mq help text updates and speling fixes
Brendan Cully <brendan@kublai.com>
parents:
2945
diff
changeset
|
1625 pushed only if the qselect command has activated it. A patch with |
|
b1e6d701a03a
mq help text updates and speling fixes
Brendan Cully <brendan@kublai.com>
parents:
2945
diff
changeset
|
1626 a negative guard ("-foo") is never pushed if the qselect command |
|
b1e6d701a03a
mq help text updates and speling fixes
Brendan Cully <brendan@kublai.com>
parents:
2945
diff
changeset
|
1627 has activated it. |
|
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1628 |
|
2946
b1e6d701a03a
mq help text updates and speling fixes
Brendan Cully <brendan@kublai.com>
parents:
2945
diff
changeset
|
1629 With no arguments, print the currently active guards. |
|
b1e6d701a03a
mq help text updates and speling fixes
Brendan Cully <brendan@kublai.com>
parents:
2945
diff
changeset
|
1630 With arguments, set guards for the named patch. |
|
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1631 |
|
2946
b1e6d701a03a
mq help text updates and speling fixes
Brendan Cully <brendan@kublai.com>
parents:
2945
diff
changeset
|
1632 To set a negative guard "-foo" on topmost patch ("--" is needed so |
|
b1e6d701a03a
mq help text updates and speling fixes
Brendan Cully <brendan@kublai.com>
parents:
2945
diff
changeset
|
1633 hg will not interpret "-foo" as an option): |
|
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1634 hg qguard -- -foo |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1635 |
|
2946
b1e6d701a03a
mq help text updates and speling fixes
Brendan Cully <brendan@kublai.com>
parents:
2945
diff
changeset
|
1636 To set guards on another patch: |
|
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1637 hg qguard other.patch +2.6.17 -stable |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1638 ''' |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1639 def status(idx): |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1640 guards = q.series_guards[idx] or ['unguarded'] |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1641 ui.write('%s: %s\n' % (q.series[idx], ' '.join(guards))) |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1642 q = repo.mq |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1643 patch = None |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1644 args = list(args) |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1645 if opts['list']: |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1646 if args or opts['none']: |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1647 raise util.Abort(_('cannot mix -l/--list with options or arguments')) |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1648 for i in xrange(len(q.series)): |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1649 status(i) |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1650 return |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1651 if not args or args[0][0:1] in '-+': |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1652 if not q.applied: |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1653 raise util.Abort(_('no patches applied')) |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1654 patch = q.applied[-1].name |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1655 if patch is None and args[0][0:1] not in '-+': |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1656 patch = args.pop(0) |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1657 if patch is None: |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1658 raise util.Abort(_('no patch to work with')) |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1659 if args or opts['none']: |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1660 q.set_guards(q.find_series(patch), args) |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1661 q.save_dirty() |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1662 else: |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1663 status(q.series.index(q.lookup(patch))) |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1664 |
|
2747
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2746
diff
changeset
|
1665 def header(ui, repo, patch=None): |
|
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2746
diff
changeset
|
1666 """Print the header of the topmost or specified patch""" |
|
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2746
diff
changeset
|
1667 q = repo.mq |
|
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2746
diff
changeset
|
1668 |
|
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2746
diff
changeset
|
1669 if patch: |
|
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2746
diff
changeset
|
1670 patch = q.lookup(patch) |
|
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2746
diff
changeset
|
1671 else: |
|
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2746
diff
changeset
|
1672 if not q.applied: |
|
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2746
diff
changeset
|
1673 ui.write('No patches applied\n') |
|
3014
c203ccd7d838
qheader: exit withh meaningful error code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
3012
diff
changeset
|
1674 return 1 |
|
2747
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2746
diff
changeset
|
1675 patch = q.lookup('qtip') |
|
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2746
diff
changeset
|
1676 message = repo.mq.readheaders(patch)[0] |
|
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2746
diff
changeset
|
1677 |
|
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2746
diff
changeset
|
1678 ui.write('\n'.join(message) + '\n') |
|
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2746
diff
changeset
|
1679 |
| 1808 | 1680 def lastsavename(path): |
|
2794
86c54b7cd331
mq: fix variables shadowing builtin
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2792
diff
changeset
|
1681 (directory, base) = os.path.split(path) |
|
86c54b7cd331
mq: fix variables shadowing builtin
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2792
diff
changeset
|
1682 names = os.listdir(directory) |
| 1808 | 1683 namere = re.compile("%s.([0-9]+)" % base) |
|
2794
86c54b7cd331
mq: fix variables shadowing builtin
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2792
diff
changeset
|
1684 maxindex = None |
| 1808 | 1685 maxname = None |
| 1686 for f in names: | |
| 1687 m = namere.match(f) | |
| 1688 if m: | |
| 1689 index = int(m.group(1)) | |
|
2794
86c54b7cd331
mq: fix variables shadowing builtin
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2792
diff
changeset
|
1690 if maxindex == None or index > maxindex: |
|
86c54b7cd331
mq: fix variables shadowing builtin
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2792
diff
changeset
|
1691 maxindex = index |
| 1808 | 1692 maxname = f |
| 1693 if maxname: | |
|
2794
86c54b7cd331
mq: fix variables shadowing builtin
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2792
diff
changeset
|
1694 return (os.path.join(directory, maxname), maxindex) |
| 1808 | 1695 return (None, None) |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1696 |
| 1808 | 1697 def savename(path): |
| 1698 (last, index) = lastsavename(path) | |
| 1699 if last is None: | |
| 1700 index = 0 | |
| 1701 newpath = path + ".%d" % (index + 1) | |
| 1702 return newpath | |
| 1703 | |
| 1704 def push(ui, repo, patch=None, **opts): | |
| 1705 """push the next patch onto the stack""" | |
|
2724
9c41ae1908c7
mq: replace module-wide repo hash with a repo attribute
Brendan Cully <brendan@kublai.com>
parents:
2723
diff
changeset
|
1706 q = repo.mq |
| 1808 | 1707 mergeq = None |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1708 |
| 1808 | 1709 if opts['all']: |
| 1710 patch = q.series[-1] | |
| 1711 if opts['merge']: | |
| 1712 if opts['name']: | |
| 1713 newpath = opts['name'] | |
| 1714 else: | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1715 newpath, i = lastsavename(q.path) |
| 1808 | 1716 if not newpath: |
| 1717 ui.warn("no saved queues found, please use -n\n") | |
| 1718 return 1 | |
| 1719 mergeq = queue(ui, repo.join(""), newpath) | |
| 1720 ui.warn("merging with queue at: %s\n" % mergeq.path) | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1721 ret = q.push(repo, patch, force=opts['force'], list=opts['list'], |
| 1808 | 1722 mergeq=mergeq) |
| 1723 q.save_dirty() | |
| 1724 return ret | |
| 1725 | |
| 1726 def pop(ui, repo, patch=None, **opts): | |
| 1727 """pop the current patch off the stack""" | |
| 1728 localupdate = True | |
| 1729 if opts['name']: | |
| 1730 q = queue(ui, repo.join(""), repo.join(opts['name'])) | |
| 1731 ui.warn('using patch queue: %s\n' % q.path) | |
| 1732 localupdate = False | |
| 1733 else: | |
|
2724
9c41ae1908c7
mq: replace module-wide repo hash with a repo attribute
Brendan Cully <brendan@kublai.com>
parents:
2723
diff
changeset
|
1734 q = repo.mq |
|
2697
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
1735 q.pop(repo, patch, force=opts['force'], update=localupdate, all=opts['all']) |
| 1808 | 1736 q.save_dirty() |
| 1737 return 0 | |
| 1738 | |
|
2750
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1739 def rename(ui, repo, patch, name=None, **opts): |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1740 """rename a patch |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1741 |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1742 With one argument, renames the current patch to PATCH1. |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1743 With two arguments, renames PATCH1 to PATCH2.""" |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1744 |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1745 q = repo.mq |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1746 |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1747 if not name: |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1748 name = patch |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1749 patch = None |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1750 |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1751 if patch: |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1752 patch = q.lookup(patch) |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1753 else: |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1754 if not q.applied: |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1755 ui.write(_('No patches applied\n')) |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1756 return |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1757 patch = q.lookup('qtip') |
|
3089
82c9d1aac308
Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
3088
diff
changeset
|
1758 absdest = q.join(name) |
|
82c9d1aac308
Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
3088
diff
changeset
|
1759 if os.path.isdir(absdest): |
|
82c9d1aac308
Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
3088
diff
changeset
|
1760 name = os.path.join(name, os.path.basename(patch)) |
|
82c9d1aac308
Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
3088
diff
changeset
|
1761 absdest = q.join(name) |
|
82c9d1aac308
Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
3088
diff
changeset
|
1762 if os.path.exists(absdest): |
|
82c9d1aac308
Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
3088
diff
changeset
|
1763 raise util.Abort(_('%s already exists') % absdest) |
|
82c9d1aac308
Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
3088
diff
changeset
|
1764 |
|
82c9d1aac308
Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
3088
diff
changeset
|
1765 if name in q.series: |
|
82c9d1aac308
Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
3088
diff
changeset
|
1766 raise util.Abort(_('A patch named %s already exists in the series file') % name) |
|
2750
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1767 |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1768 if ui.verbose: |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1769 ui.write('Renaming %s to %s\n' % (patch, name)) |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1770 i = q.find_series(patch) |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1771 q.full_series[i] = name |
|
2767
60683ab1ed33
mq: rename read_series as parse_series, make simpler and faster
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2766
diff
changeset
|
1772 q.parse_series() |
|
2750
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1773 q.series_dirty = 1 |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1774 |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1775 info = q.isapplied(patch) |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1776 if info: |
|
2818
bdc067ff6cf5
Make mq camelcase consistent with the rest of hg.
Brendan Cully <brendan@kublai.com>
parents:
2816
diff
changeset
|
1777 q.applied[info[0]] = statusentry(info[1], name) |
|
2750
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1778 q.applied_dirty = 1 |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1779 |
| 2819 | 1780 util.rename(q.join(patch), absdest) |
|
2750
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1781 r = q.qrepo() |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1782 if r: |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1783 wlock = r.wlock() |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1784 if r.dirstate.state(name) == 'r': |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1785 r.undelete([name], wlock) |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1786 r.copy(patch, name, wlock) |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1787 r.remove([patch], False, wlock) |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1788 |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1789 q.save_dirty() |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1790 |
| 1808 | 1791 def restore(ui, repo, rev, **opts): |
| 1792 """restore the queue state saved by a rev""" | |
| 1793 rev = repo.lookup(rev) | |
|
2724
9c41ae1908c7
mq: replace module-wide repo hash with a repo attribute
Brendan Cully <brendan@kublai.com>
parents:
2723
diff
changeset
|
1794 q = repo.mq |
| 1808 | 1795 q.restore(repo, rev, delete=opts['delete'], |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1796 qupdate=opts['update']) |
| 1808 | 1797 q.save_dirty() |
| 1798 return 0 | |
| 1799 | |
| 1800 def save(ui, repo, **opts): | |
| 1801 """save current queue state""" | |
|
2724
9c41ae1908c7
mq: replace module-wide repo hash with a repo attribute
Brendan Cully <brendan@kublai.com>
parents:
2723
diff
changeset
|
1802 q = repo.mq |
|
2804
4b20daa25f15
Update mq to use new logmessage arglist from 2794:bd8a9a94139f
Brendan Cully <brendan@kublai.com>
parents:
2803
diff
changeset
|
1803 message = commands.logmessage(opts) |
|
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1804 ret = q.save(repo, msg=message) |
| 1808 | 1805 if ret: |
| 1806 return ret | |
| 1807 q.save_dirty() | |
| 1808 if opts['copy']: | |
| 1809 path = q.path | |
| 1810 if opts['name']: | |
| 1811 newpath = os.path.join(q.basepath, opts['name']) | |
| 1812 if os.path.exists(newpath): | |
| 1813 if not os.path.isdir(newpath): | |
|
2712
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2711
diff
changeset
|
1814 raise util.Abort(_('destination %s exists and is not ' |
|
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2711
diff
changeset
|
1815 'a directory') % newpath) |
| 1808 | 1816 if not opts['force']: |
|
2712
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2711
diff
changeset
|
1817 raise util.Abort(_('destination %s exists, ' |
|
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2711
diff
changeset
|
1818 'use -f to force') % newpath) |
| 1808 | 1819 else: |
| 1820 newpath = savename(path) | |
| 1821 ui.warn("copy %s to %s\n" % (path, newpath)) | |
| 1822 util.copyfiles(path, newpath) | |
| 1823 if opts['empty']: | |
| 1824 try: | |
| 2819 | 1825 os.unlink(q.join(q.status_path)) |
| 1808 | 1826 except: |
| 1827 pass | |
| 1828 return 0 | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1829 |
| 1808 | 1830 def strip(ui, repo, rev, **opts): |
| 1831 """strip a revision and all later revs on the same branch""" | |
| 1832 rev = repo.lookup(rev) | |
| 1833 backup = 'all' | |
| 1834 if opts['backup']: | |
| 1835 backup = 'strip' | |
| 1836 elif opts['nobackup']: | |
| 1837 backup = 'none' | |
|
3093
fd1479e30aaf
mq: do not update an empty working directory after strip.
Brendan Cully <brendan@kublai.com>
parents:
3092
diff
changeset
|
1838 update = repo.dirstate.parents()[0] != revlog.nullid |
|
fd1479e30aaf
mq: do not update an empty working directory after strip.
Brendan Cully <brendan@kublai.com>
parents:
3092
diff
changeset
|
1839 repo.mq.strip(repo, rev, backup=backup, update=update) |
| 1808 | 1840 return 0 |
| 1841 | |
|
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1842 def select(ui, repo, *args, **opts): |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1843 '''set or print guarded patches to push |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1844 |
|
2946
b1e6d701a03a
mq help text updates and speling fixes
Brendan Cully <brendan@kublai.com>
parents:
2945
diff
changeset
|
1845 Use the qguard command to set or print guards on patch, then use |
|
b1e6d701a03a
mq help text updates and speling fixes
Brendan Cully <brendan@kublai.com>
parents:
2945
diff
changeset
|
1846 qselect to tell mq which guards to use. A patch will be pushed if it |
|
b1e6d701a03a
mq help text updates and speling fixes
Brendan Cully <brendan@kublai.com>
parents:
2945
diff
changeset
|
1847 has no guards or any positive guards match the currently selected guard, |
|
b1e6d701a03a
mq help text updates and speling fixes
Brendan Cully <brendan@kublai.com>
parents:
2945
diff
changeset
|
1848 but will not be pushed if any negative guards match the current guard. |
|
b1e6d701a03a
mq help text updates and speling fixes
Brendan Cully <brendan@kublai.com>
parents:
2945
diff
changeset
|
1849 For example: |
|
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1850 |
|
2946
b1e6d701a03a
mq help text updates and speling fixes
Brendan Cully <brendan@kublai.com>
parents:
2945
diff
changeset
|
1851 qguard foo.patch -stable (negative guard) |
|
b1e6d701a03a
mq help text updates and speling fixes
Brendan Cully <brendan@kublai.com>
parents:
2945
diff
changeset
|
1852 qguard bar.patch +stable (positive guard) |
|
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1853 qselect stable |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1854 |
|
2946
b1e6d701a03a
mq help text updates and speling fixes
Brendan Cully <brendan@kublai.com>
parents:
2945
diff
changeset
|
1855 This activates the "stable" guard. mq will skip foo.patch (because |
|
b1e6d701a03a
mq help text updates and speling fixes
Brendan Cully <brendan@kublai.com>
parents:
2945
diff
changeset
|
1856 it has a negative match) but push bar.patch (because it |
|
b1e6d701a03a
mq help text updates and speling fixes
Brendan Cully <brendan@kublai.com>
parents:
2945
diff
changeset
|
1857 has a positive match). |
|
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1858 |
|
2946
b1e6d701a03a
mq help text updates and speling fixes
Brendan Cully <brendan@kublai.com>
parents:
2945
diff
changeset
|
1859 With no arguments, prints the currently active guards. |
|
b1e6d701a03a
mq help text updates and speling fixes
Brendan Cully <brendan@kublai.com>
parents:
2945
diff
changeset
|
1860 With one argument, sets the active guard. |
|
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1861 |
|
2946
b1e6d701a03a
mq help text updates and speling fixes
Brendan Cully <brendan@kublai.com>
parents:
2945
diff
changeset
|
1862 Use -n/--none to deactivate guards (no other arguments needed). |
|
b1e6d701a03a
mq help text updates and speling fixes
Brendan Cully <brendan@kublai.com>
parents:
2945
diff
changeset
|
1863 When no guards are active, patches with positive guards are skipped |
|
b1e6d701a03a
mq help text updates and speling fixes
Brendan Cully <brendan@kublai.com>
parents:
2945
diff
changeset
|
1864 and patches with negative guards are pushed. |
|
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1865 |
|
2946
b1e6d701a03a
mq help text updates and speling fixes
Brendan Cully <brendan@kublai.com>
parents:
2945
diff
changeset
|
1866 qselect can change the guards on applied patches. It does not pop |
|
b1e6d701a03a
mq help text updates and speling fixes
Brendan Cully <brendan@kublai.com>
parents:
2945
diff
changeset
|
1867 guarded patches by default. Use --pop to pop back to the last applied |
|
b1e6d701a03a
mq help text updates and speling fixes
Brendan Cully <brendan@kublai.com>
parents:
2945
diff
changeset
|
1868 patch that is not guarded. Use --reapply (which implies --pop) to push |
|
b1e6d701a03a
mq help text updates and speling fixes
Brendan Cully <brendan@kublai.com>
parents:
2945
diff
changeset
|
1869 back to the current patch afterwards, but skip guarded patches. |
|
2850
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2830
diff
changeset
|
1870 |
|
2946
b1e6d701a03a
mq help text updates and speling fixes
Brendan Cully <brendan@kublai.com>
parents:
2945
diff
changeset
|
1871 Use -s/--series to print a list of all guards in the series file (no |
|
b1e6d701a03a
mq help text updates and speling fixes
Brendan Cully <brendan@kublai.com>
parents:
2945
diff
changeset
|
1872 other arguments needed). Use -v for more information.''' |
|
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1873 |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1874 q = repo.mq |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1875 guards = q.active() |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1876 if args or opts['none']: |
|
2850
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2830
diff
changeset
|
1877 old_unapplied = q.unapplied(repo) |
|
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2830
diff
changeset
|
1878 old_guarded = [i for i in xrange(len(q.applied)) if |
|
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2830
diff
changeset
|
1879 not q.pushable(i)[0]] |
|
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1880 q.set_active(args) |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1881 q.save_dirty() |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1882 if not args: |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1883 ui.status(_('guards deactivated\n')) |
|
2850
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2830
diff
changeset
|
1884 if not opts['pop'] and not opts['reapply']: |
|
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2830
diff
changeset
|
1885 unapplied = q.unapplied(repo) |
|
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2830
diff
changeset
|
1886 guarded = [i for i in xrange(len(q.applied)) |
|
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2830
diff
changeset
|
1887 if not q.pushable(i)[0]] |
|
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2830
diff
changeset
|
1888 if len(unapplied) != len(old_unapplied): |
|
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2830
diff
changeset
|
1889 ui.status(_('number of unguarded, unapplied patches has ' |
|
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2830
diff
changeset
|
1890 'changed from %d to %d\n') % |
|
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2830
diff
changeset
|
1891 (len(old_unapplied), len(unapplied))) |
|
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2830
diff
changeset
|
1892 if len(guarded) != len(old_guarded): |
|
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2830
diff
changeset
|
1893 ui.status(_('number of guarded, applied patches has changed ' |
|
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2830
diff
changeset
|
1894 'from %d to %d\n') % |
|
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2830
diff
changeset
|
1895 (len(old_guarded), len(guarded))) |
|
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1896 elif opts['series']: |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1897 guards = {} |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1898 noguards = 0 |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1899 for gs in q.series_guards: |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1900 if not gs: |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1901 noguards += 1 |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1902 for g in gs: |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1903 guards.setdefault(g, 0) |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1904 guards[g] += 1 |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1905 if ui.verbose: |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1906 guards['NONE'] = noguards |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1907 guards = guards.items() |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1908 guards.sort(lambda a, b: cmp(a[0][1:], b[0][1:])) |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1909 if guards: |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1910 ui.note(_('guards in series file:\n')) |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1911 for guard, count in guards: |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1912 ui.note('%2d ' % count) |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1913 ui.write(guard, '\n') |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1914 else: |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1915 ui.note(_('no guards in series file\n')) |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1916 else: |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1917 if guards: |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1918 ui.note(_('active guards:\n')) |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1919 for g in guards: |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1920 ui.write(g, '\n') |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1921 else: |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1922 ui.write(_('no active guards\n')) |
|
2850
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2830
diff
changeset
|
1923 reapply = opts['reapply'] and q.applied and q.appliedname(-1) |
|
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2830
diff
changeset
|
1924 popped = False |
|
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2830
diff
changeset
|
1925 if opts['pop'] or opts['reapply']: |
|
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2830
diff
changeset
|
1926 for i in xrange(len(q.applied)): |
|
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2830
diff
changeset
|
1927 pushable, reason = q.pushable(i) |
|
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2830
diff
changeset
|
1928 if not pushable: |
|
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2830
diff
changeset
|
1929 ui.status(_('popping guarded patches\n')) |
|
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2830
diff
changeset
|
1930 popped = True |
|
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2830
diff
changeset
|
1931 if i == 0: |
|
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2830
diff
changeset
|
1932 q.pop(repo, all=True) |
|
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2830
diff
changeset
|
1933 else: |
|
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2830
diff
changeset
|
1934 q.pop(repo, i-1) |
|
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2830
diff
changeset
|
1935 break |
|
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2830
diff
changeset
|
1936 if popped: |
|
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2830
diff
changeset
|
1937 try: |
|
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2830
diff
changeset
|
1938 if reapply: |
|
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2830
diff
changeset
|
1939 ui.status(_('reapplying unguarded patches\n')) |
|
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2830
diff
changeset
|
1940 q.push(repo, reapply) |
|
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2830
diff
changeset
|
1941 finally: |
|
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2830
diff
changeset
|
1942 q.save_dirty() |
|
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
1943 |
| 1808 | 1944 def reposetup(ui, repo): |
|
2818
bdc067ff6cf5
Make mq camelcase consistent with the rest of hg.
Brendan Cully <brendan@kublai.com>
parents:
2816
diff
changeset
|
1945 class mqrepo(repo.__class__): |
|
2854
307439d6fede
mq: do not allow to push from repo with patches applied
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2851
diff
changeset
|
1946 def abort_if_wdir_patched(self, errmsg, force=False): |
|
307439d6fede
mq: do not allow to push from repo with patches applied
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2851
diff
changeset
|
1947 if self.mq.applied and not force: |
|
307439d6fede
mq: do not allow to push from repo with patches applied
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2851
diff
changeset
|
1948 parent = revlog.hex(self.dirstate.parents()[0]) |
|
307439d6fede
mq: do not allow to push from repo with patches applied
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2851
diff
changeset
|
1949 if parent in [s.rev for s in self.mq.applied]: |
|
307439d6fede
mq: do not allow to push from repo with patches applied
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2851
diff
changeset
|
1950 raise util.Abort(errmsg) |
|
307439d6fede
mq: do not allow to push from repo with patches applied
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2851
diff
changeset
|
1951 |
|
2851
addd03c7fbfa
Disallow commit over an applied mq patch.
Brendan Cully <brendan@kublai.com>
parents:
2850
diff
changeset
|
1952 def commit(self, *args, **opts): |
|
addd03c7fbfa
Disallow commit over an applied mq patch.
Brendan Cully <brendan@kublai.com>
parents:
2850
diff
changeset
|
1953 if len(args) >= 6: |
|
addd03c7fbfa
Disallow commit over an applied mq patch.
Brendan Cully <brendan@kublai.com>
parents:
2850
diff
changeset
|
1954 force = args[5] |
|
addd03c7fbfa
Disallow commit over an applied mq patch.
Brendan Cully <brendan@kublai.com>
parents:
2850
diff
changeset
|
1955 else: |
|
addd03c7fbfa
Disallow commit over an applied mq patch.
Brendan Cully <brendan@kublai.com>
parents:
2850
diff
changeset
|
1956 force = opts.get('force') |
|
2854
307439d6fede
mq: do not allow to push from repo with patches applied
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2851
diff
changeset
|
1957 self.abort_if_wdir_patched( |
|
307439d6fede
mq: do not allow to push from repo with patches applied
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2851
diff
changeset
|
1958 _('cannot commit over an applied mq patch'), |
|
307439d6fede
mq: do not allow to push from repo with patches applied
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2851
diff
changeset
|
1959 force) |
|
2851
addd03c7fbfa
Disallow commit over an applied mq patch.
Brendan Cully <brendan@kublai.com>
parents:
2850
diff
changeset
|
1960 |
|
addd03c7fbfa
Disallow commit over an applied mq patch.
Brendan Cully <brendan@kublai.com>
parents:
2850
diff
changeset
|
1961 return super(mqrepo, self).commit(*args, **opts) |
|
addd03c7fbfa
Disallow commit over an applied mq patch.
Brendan Cully <brendan@kublai.com>
parents:
2850
diff
changeset
|
1962 |
|
2854
307439d6fede
mq: do not allow to push from repo with patches applied
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2851
diff
changeset
|
1963 def push(self, remote, force=False, revs=None): |
|
307439d6fede
mq: do not allow to push from repo with patches applied
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2851
diff
changeset
|
1964 if self.mq.applied and not force: |
|
307439d6fede
mq: do not allow to push from repo with patches applied
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2851
diff
changeset
|
1965 raise util.Abort(_('source has mq patches applied')) |
|
307439d6fede
mq: do not allow to push from repo with patches applied
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2851
diff
changeset
|
1966 return super(mqrepo, self).push(remote, force, revs) |
|
307439d6fede
mq: do not allow to push from repo with patches applied
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2851
diff
changeset
|
1967 |
|
2723
04d9b31faeca
mq: do not hold a reference to repo in tags override
Brendan Cully <brendan@kublai.com>
parents:
2720
diff
changeset
|
1968 def tags(self): |
|
04d9b31faeca
mq: do not hold a reference to repo in tags override
Brendan Cully <brendan@kublai.com>
parents:
2720
diff
changeset
|
1969 if self.tagscache: |
|
04d9b31faeca
mq: do not hold a reference to repo in tags override
Brendan Cully <brendan@kublai.com>
parents:
2720
diff
changeset
|
1970 return self.tagscache |
|
04d9b31faeca
mq: do not hold a reference to repo in tags override
Brendan Cully <brendan@kublai.com>
parents:
2720
diff
changeset
|
1971 |
|
2818
bdc067ff6cf5
Make mq camelcase consistent with the rest of hg.
Brendan Cully <brendan@kublai.com>
parents:
2816
diff
changeset
|
1972 tagscache = super(mqrepo, self).tags() |
|
2682
4e2dc5c16e61
Add mq patch names to tagscache instead of overriding lookup.
Brendan Cully <brendan@kublai.com>
parents:
2677
diff
changeset
|
1973 |
|
2724
9c41ae1908c7
mq: replace module-wide repo hash with a repo attribute
Brendan Cully <brendan@kublai.com>
parents:
2723
diff
changeset
|
1974 q = self.mq |
|
2723
04d9b31faeca
mq: do not hold a reference to repo in tags override
Brendan Cully <brendan@kublai.com>
parents:
2720
diff
changeset
|
1975 if not q.applied: |
|
04d9b31faeca
mq: do not hold a reference to repo in tags override
Brendan Cully <brendan@kublai.com>
parents:
2720
diff
changeset
|
1976 return tagscache |
|
2663
96950d39171d
Mq: modify repo.lookup to resolve applied patches too.
Brendan Cully <brendan@kublai.com>
parents:
2554
diff
changeset
|
1977 |
|
2780
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
1978 mqtags = [(patch.rev, patch.name) for patch in q.applied] |
|
2723
04d9b31faeca
mq: do not hold a reference to repo in tags override
Brendan Cully <brendan@kublai.com>
parents:
2720
diff
changeset
|
1979 mqtags.append((mqtags[-1][0], 'qtip')) |
|
04d9b31faeca
mq: do not hold a reference to repo in tags override
Brendan Cully <brendan@kublai.com>
parents:
2720
diff
changeset
|
1980 mqtags.append((mqtags[0][0], 'qbase')) |
|
04d9b31faeca
mq: do not hold a reference to repo in tags override
Brendan Cully <brendan@kublai.com>
parents:
2720
diff
changeset
|
1981 for patch in mqtags: |
|
04d9b31faeca
mq: do not hold a reference to repo in tags override
Brendan Cully <brendan@kublai.com>
parents:
2720
diff
changeset
|
1982 if patch[1] in tagscache: |
|
04d9b31faeca
mq: do not hold a reference to repo in tags override
Brendan Cully <brendan@kublai.com>
parents:
2720
diff
changeset
|
1983 self.ui.warn('Tag %s overrides mq patch of the same name\n' % patch[1]) |
|
04d9b31faeca
mq: do not hold a reference to repo in tags override
Brendan Cully <brendan@kublai.com>
parents:
2720
diff
changeset
|
1984 else: |
|
04d9b31faeca
mq: do not hold a reference to repo in tags override
Brendan Cully <brendan@kublai.com>
parents:
2720
diff
changeset
|
1985 tagscache[patch[1]] = revlog.bin(patch[0]) |
|
2682
4e2dc5c16e61
Add mq patch names to tagscache instead of overriding lookup.
Brendan Cully <brendan@kublai.com>
parents:
2677
diff
changeset
|
1986 |
|
4e2dc5c16e61
Add mq patch names to tagscache instead of overriding lookup.
Brendan Cully <brendan@kublai.com>
parents:
2677
diff
changeset
|
1987 return tagscache |
|
2664
9b8df8dceeed
Add qtip and qbase to mq qlookup.
Brendan Cully <brendan@kublai.com>
parents:
2663
diff
changeset
|
1988 |
|
2857
82f50658c72b
mq: only add mq attribute to local repo
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2856
diff
changeset
|
1989 if repo.local(): |
|
82f50658c72b
mq: only add mq attribute to local repo
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2856
diff
changeset
|
1990 repo.__class__ = mqrepo |
|
82f50658c72b
mq: only add mq attribute to local repo
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2856
diff
changeset
|
1991 repo.mq = queue(ui, repo.join("")) |
| 1808 | 1992 |
|
3189
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1993 seriesopts = [('s', 'summary', None, _('print first line of patch header'))] |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1994 |
| 1808 | 1995 cmdtable = { |
|
3189
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
1996 "qapplied": (applied, [] + seriesopts, 'hg qapplied [-s] [PATCH]'), |
|
2720
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2713
diff
changeset
|
1997 "qclone": (clone, |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2713
diff
changeset
|
1998 [('', 'pull', None, _('use pull protocol to copy metadata')), |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2713
diff
changeset
|
1999 ('U', 'noupdate', None, _('do not update the new working directories')), |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2713
diff
changeset
|
2000 ('', 'uncompressed', None, |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2713
diff
changeset
|
2001 _('use uncompressed transfer (fast over LAN)')), |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2713
diff
changeset
|
2002 ('e', 'ssh', '', _('specify ssh command to use')), |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2713
diff
changeset
|
2003 ('p', 'patches', '', _('location of source patch repo')), |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2713
diff
changeset
|
2004 ('', 'remotecmd', '', |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2713
diff
changeset
|
2005 _('specify hg command to run on the remote side'))], |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2713
diff
changeset
|
2006 'hg qclone [OPTION]... SOURCE [DEST]'), |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
2007 "qcommit|qci": |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
2008 (commit, |
|
2185
5acd648770d0
Better help for mq: Corrected synopses, get qcommit options from commands.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2097
diff
changeset
|
2009 commands.table["^commit|ci"][1], |
|
5acd648770d0
Better help for mq: Corrected synopses, get qcommit options from commands.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2097
diff
changeset
|
2010 'hg qcommit [OPTION]... [FILE]...'), |
|
2943
9dc568f5e03d
Fix test-mq-qdiff; add -I and -X options to qdiff
Brendan Cully <brendan@kublai.com>
parents:
2942
diff
changeset
|
2011 "^qdiff": (diff, |
|
9dc568f5e03d
Fix test-mq-qdiff; add -I and -X options to qdiff
Brendan Cully <brendan@kublai.com>
parents:
2942
diff
changeset
|
2012 [('I', 'include', [], _('include names matching the given patterns')), |
|
9dc568f5e03d
Fix test-mq-qdiff; add -I and -X options to qdiff
Brendan Cully <brendan@kublai.com>
parents:
2942
diff
changeset
|
2013 ('X', 'exclude', [], _('exclude names matching the given patterns'))], |
|
9dc568f5e03d
Fix test-mq-qdiff; add -I and -X options to qdiff
Brendan Cully <brendan@kublai.com>
parents:
2942
diff
changeset
|
2014 'hg qdiff [-I] [-X] [FILE]...'), |
|
2910
57b88b86a845
Replace qdel/qfold -f option with -k/--keep.
Brendan Cully <brendan@kublai.com>
parents:
2889
diff
changeset
|
2015 "qdelete|qremove|qrm": |
|
2752
5dfeda163bb7
Add -f option to qdelete, to remove patch file.
Brendan Cully <brendan@kublai.com>
parents:
2751
diff
changeset
|
2016 (delete, |
|
3094
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
3093
diff
changeset
|
2017 [('f', 'forget', None, _('stop managing an applied patch')), |
|
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
3093
diff
changeset
|
2018 ('k', 'keep', None, _('keep patch file'))], |
|
dc784839516d
mq: add qdelete --forget option
Brendan Cully <brendan@kublai.com>
parents:
3093
diff
changeset
|
2019 'hg qdelete [-f] [-k] PATCH'), |
|
2753
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
2020 'qfold': |
|
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
2021 (fold, |
|
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
2022 [('e', 'edit', None, _('edit patch header')), |
|
2910
57b88b86a845
Replace qdel/qfold -f option with -k/--keep.
Brendan Cully <brendan@kublai.com>
parents:
2889
diff
changeset
|
2023 ('k', 'keep', None, _('keep folded patch files')), |
|
2753
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
2024 ('m', 'message', '', _('set patch header to <text>')), |
|
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
2025 ('l', 'logfile', '', _('set patch header to contents of <file>'))], |
|
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
2026 'hg qfold [-e] [-m <text>] [-l <file] PATCH...'), |
|
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
2027 'qguard': (guard, [('l', 'list', None, _('list all patches and guards')), |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
2028 ('n', 'none', None, _('drop all guards'))], |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
2029 'hg qguard [PATCH] [+GUARD...] [-GUARD...]'), |
|
2747
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2746
diff
changeset
|
2030 'qheader': (header, [], |
|
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2746
diff
changeset
|
2031 _('hg qheader [PATCH]')), |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
2032 "^qimport": |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
2033 (qimport, |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
2034 [('e', 'existing', None, 'import file in patch dir'), |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
2035 ('n', 'name', '', 'patch file name'), |
|
3147
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
2036 ('f', 'force', None, 'overwrite existing files'), |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
2037 ('r', 'rev', [], 'place existing revisions under mq control')], |
|
e21337e06952
mq: Add --rev argument to qimport, to adopt existing changesets.
Brendan Cully <brendan@kublai.com>
parents:
3139
diff
changeset
|
2038 'hg qimport [-e] [-n NAME] [-f] [-r REV]... FILE...'), |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
2039 "^qinit": |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
2040 (init, |
|
2526
37785f986260
mq: Added help for qcommit, consistently talk about queue repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2488
diff
changeset
|
2041 [('c', 'create-repo', None, 'create queue repository')], |
|
2185
5acd648770d0
Better help for mq: Corrected synopses, get qcommit options from commands.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2097
diff
changeset
|
2042 'hg qinit [-c]'), |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
2043 "qnew": |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
2044 (new, |
| 2945 | 2045 [('e', 'edit', None, _('edit commit message')), |
| 2046 ('m', 'message', '', _('use <text> as commit message')), | |
|
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
2047 ('l', 'logfile', '', _('read the commit message from <file>')), |
|
2754
19041b8cbc86
Add more verbose help text to mq commands.
Brendan Cully <brendan@kublai.com>
parents:
2753
diff
changeset
|
2048 ('f', 'force', None, _('import uncommitted changes into patch'))], |
| 2945 | 2049 'hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH'), |
|
3189
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
2050 "qnext": (next, [] + seriesopts, 'hg qnext [-s]'), |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
2051 "qprev": (prev, [] + seriesopts, 'hg qprev [-s]'), |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
2052 "^qpop": |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
2053 (pop, |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
2054 [('a', 'all', None, 'pop all patches'), |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
2055 ('n', 'name', '', 'queue name to pop'), |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
2056 ('f', 'force', None, 'forget any local changes')], |
|
2185
5acd648770d0
Better help for mq: Corrected synopses, get qcommit options from commands.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2097
diff
changeset
|
2057 'hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]'), |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
2058 "^qpush": |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
2059 (push, |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
2060 [('f', 'force', None, 'apply if the patch has rejects'), |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
2061 ('l', 'list', None, 'list patch name in commit text'), |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
2062 ('a', 'all', None, 'apply all patches'), |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
2063 ('m', 'merge', None, 'merge from another queue'), |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
2064 ('n', 'name', '', 'merge queue name')], |
|
2185
5acd648770d0
Better help for mq: Corrected synopses, get qcommit options from commands.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2097
diff
changeset
|
2065 'hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]'), |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
2066 "^qrefresh": |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
2067 (refresh, |
|
2746
0503eb5c0a33
Add option -e/--edit to qrefresh, to edit the existing header.
Brendan Cully <brendan@kublai.com>
parents:
2745
diff
changeset
|
2068 [('e', 'edit', None, _('edit commit message')), |
|
0503eb5c0a33
Add option -e/--edit to qrefresh, to edit the existing header.
Brendan Cully <brendan@kublai.com>
parents:
2745
diff
changeset
|
2069 ('m', 'message', '', _('change commit message with <text>')), |
|
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
2070 ('l', 'logfile', '', _('change commit message with <file> content')), |
|
3092
17747e80ea6c
mq: Add --git option to qrefresh
Brendan Cully <brendan@kublai.com>
parents:
3091
diff
changeset
|
2071 ('g', 'git', None, _('use git extended diff format')), |
|
2944
5b7a118f5b6c
allow qrefresh to take a list of files; closes #96.
Brendan Cully <brendan@kublai.com>
parents:
2943
diff
changeset
|
2072 ('s', 'short', None, 'short refresh'), |
|
5b7a118f5b6c
allow qrefresh to take a list of files; closes #96.
Brendan Cully <brendan@kublai.com>
parents:
2943
diff
changeset
|
2073 ('I', 'include', [], _('include names matching the given patterns')), |
|
5b7a118f5b6c
allow qrefresh to take a list of files; closes #96.
Brendan Cully <brendan@kublai.com>
parents:
2943
diff
changeset
|
2074 ('X', 'exclude', [], _('exclude names matching the given patterns'))], |
|
5b7a118f5b6c
allow qrefresh to take a list of files; closes #96.
Brendan Cully <brendan@kublai.com>
parents:
2943
diff
changeset
|
2075 'hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] FILES...'), |
|
2751
7d1de4545728
mq: add qmv as alias for qrename
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2750
diff
changeset
|
2076 'qrename|qmv': |
|
2750
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
2077 (rename, [], 'hg qrename PATCH1 [PATCH2]'), |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
2078 "qrestore": |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
2079 (restore, |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
2080 [('d', 'delete', None, 'delete save entry'), |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
2081 ('u', 'update', None, 'update queue working dir')], |
|
2185
5acd648770d0
Better help for mq: Corrected synopses, get qcommit options from commands.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2097
diff
changeset
|
2082 'hg qrestore [-d] [-u] REV'), |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
2083 "qsave": |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
2084 (save, |
|
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
2085 [('m', 'message', '', _('use <text> as commit message')), |
|
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
2086 ('l', 'logfile', '', _('read the commit message from <file>')), |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
2087 ('c', 'copy', None, 'copy patch directory'), |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
2088 ('n', 'name', '', 'copy directory name'), |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
2089 ('e', 'empty', None, 'clear queue status file'), |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
2090 ('f', 'force', None, 'force copy')], |
|
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
2091 'hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]'), |
|
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
2092 "qselect": (select, |
|
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2819
diff
changeset
|
2093 [('n', 'none', None, _('disable all guards')), |
|
2850
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2830
diff
changeset
|
2094 ('s', 'series', None, _('list all guards in series file')), |
|
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2830
diff
changeset
|
2095 ('', 'pop', None, |
|
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2830
diff
changeset
|
2096 _('pop to before first guarded applied patch')), |
|
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2830
diff
changeset
|
2097 ('', 'reapply', None, _('pop, then reapply patches'))], |
|
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2830
diff
changeset
|
2098 'hg qselect [OPTION...] [GUARD...]'), |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
2099 "qseries": |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
2100 (series, |
|
3189
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
2101 [('m', 'missing', None, 'print patches not in series')] + seriesopts, |
|
3091
240ec0e61290
Add the -s option to `hg help qseries`.
john.levon@sun.com
parents:
3089
diff
changeset
|
2102 'hg qseries [-ms]'), |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
2103 "^strip": |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
2104 (strip, |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
2105 [('f', 'force', None, 'force multi-head removal'), |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
2106 ('b', 'backup', None, 'bundle unrelated changesets'), |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
2107 ('n', 'nobackup', None, 'no backups')], |
|
2185
5acd648770d0
Better help for mq: Corrected synopses, get qcommit options from commands.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2097
diff
changeset
|
2108 'hg strip [-f] [-b] [-n] REV'), |
|
3189
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
2109 "qtop": (top, [] + seriesopts, 'hg qtop [-s]'), |
|
0e6b58c7beea
mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev
Brendan Cully <brendan@kublai.com>
parents:
3147
diff
changeset
|
2110 "qunapplied": (unapplied, [] + seriesopts, 'hg qunapplied [-s] [PATCH]'), |
| 1808 | 2111 } |