Show More
@@ -1,93 +1,93 b'' | |||||
1 | # fetch.py - pull and merge remote changes |
|
1 | # fetch.py - pull and merge remote changes | |
2 | # |
|
2 | # | |
3 | # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com> |
|
3 | # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com> | |
4 | # |
|
4 | # | |
5 | # This software may be used and distributed according to the terms |
|
5 | # This software may be used and distributed according to the terms | |
6 | # of the GNU General Public License, incorporated herein by reference. |
|
6 | # of the GNU General Public License, incorporated herein by reference. | |
7 |
|
7 | |||
8 | from mercurial.demandload import * |
|
8 | from mercurial.demandload import * | |
9 | from mercurial.i18n import gettext as _ |
|
9 | from mercurial.i18n import gettext as _ | |
10 | from mercurial.node import * |
|
10 | from mercurial.node import * | |
11 | demandload(globals(), 'mercurial:commands,hg,node,util') |
|
11 | demandload(globals(), 'mercurial:commands,hg,node,util') | |
12 |
|
12 | |||
13 | def fetch(ui, repo, source='default', **opts): |
|
13 | def fetch(ui, repo, source='default', **opts): | |
14 | '''Pull changes from a remote repository, merge new changes if needed. |
|
14 | '''Pull changes from a remote repository, merge new changes if needed. | |
15 |
|
15 | |||
16 | This finds all changes from the repository at the specified path |
|
16 | This finds all changes from the repository at the specified path | |
17 | or URL and adds them to the local repository. |
|
17 | or URL and adds them to the local repository. | |
18 |
|
18 | |||
19 | If the pulled changes add a new head, the head is automatically |
|
19 | If the pulled changes add a new head, the head is automatically | |
20 | merged, and the result of the merge is committed. Otherwise, the |
|
20 | merged, and the result of the merge is committed. Otherwise, the | |
21 | working directory is updated.''' |
|
21 | working directory is updated.''' | |
22 |
|
22 | |||
23 | def postincoming(other, modheads): |
|
23 | def postincoming(other, modheads): | |
24 | if modheads == 0: |
|
24 | if modheads == 0: | |
25 | return 0 |
|
25 | return 0 | |
26 | if modheads == 1: |
|
26 | if modheads == 1: | |
27 |
return |
|
27 | return hg.update(repo, repo.changelog.tip()) | |
28 | newheads = repo.heads(parent) |
|
28 | newheads = repo.heads(parent) | |
29 | newchildren = [n for n in repo.heads(parent) if n != parent] |
|
29 | newchildren = [n for n in repo.heads(parent) if n != parent] | |
30 | newparent = parent |
|
30 | newparent = parent | |
31 | if newchildren: |
|
31 | if newchildren: | |
32 |
|
|
32 | hg.update(repo, newchildren[0]) | |
33 | newparent = newchildren[0] |
|
33 | newparent = newchildren[0] | |
34 | newheads = [n for n in repo.heads() if n != newparent] |
|
34 | newheads = [n for n in repo.heads() if n != newparent] | |
35 | err = False |
|
35 | err = False | |
36 | if newheads: |
|
36 | if newheads: | |
37 | ui.status(_('merging with new head %d:%s\n') % |
|
37 | ui.status(_('merging with new head %d:%s\n') % | |
38 | (repo.changelog.rev(newheads[0]), short(newheads[0]))) |
|
38 | (repo.changelog.rev(newheads[0]), short(newheads[0]))) | |
39 |
err = hg. |
|
39 | err = hg.merge(repo, newheads[0], remind=False) | |
40 | if not err and len(newheads) > 1: |
|
40 | if not err and len(newheads) > 1: | |
41 | ui.status(_('not merging with %d other new heads ' |
|
41 | ui.status(_('not merging with %d other new heads ' | |
42 | '(use "hg heads" and "hg merge" to merge them)') % |
|
42 | '(use "hg heads" and "hg merge" to merge them)') % | |
43 | (len(newheads) - 1)) |
|
43 | (len(newheads) - 1)) | |
44 | if not err: |
|
44 | if not err: | |
45 | mod, add, rem = repo.status()[:3] |
|
45 | mod, add, rem = repo.status()[:3] | |
46 | message = (commands.logmessage(opts) or |
|
46 | message = (commands.logmessage(opts) or | |
47 | (_('Automated merge with %s') % other.url())) |
|
47 | (_('Automated merge with %s') % other.url())) | |
48 | n = repo.commit(mod + add + rem, message, |
|
48 | n = repo.commit(mod + add + rem, message, | |
49 | opts['user'], opts['date'], |
|
49 | opts['user'], opts['date'], | |
50 | force_editor=opts.get('force_editor')) |
|
50 | force_editor=opts.get('force_editor')) | |
51 | ui.status(_('new changeset %d:%s merges remote changes ' |
|
51 | ui.status(_('new changeset %d:%s merges remote changes ' | |
52 | 'with local\n') % (repo.changelog.rev(n), |
|
52 | 'with local\n') % (repo.changelog.rev(n), | |
53 | short(n))) |
|
53 | short(n))) | |
54 | def pull(): |
|
54 | def pull(): | |
55 | commands.setremoteconfig(ui, opts) |
|
55 | commands.setremoteconfig(ui, opts) | |
56 |
|
56 | |||
57 | other = hg.repository(ui, ui.expandpath(source)) |
|
57 | other = hg.repository(ui, ui.expandpath(source)) | |
58 | ui.status(_('pulling from %s\n') % source) |
|
58 | ui.status(_('pulling from %s\n') % source) | |
59 | revs = None |
|
59 | revs = None | |
60 | if opts['rev'] and not other.local(): |
|
60 | if opts['rev'] and not other.local(): | |
61 | raise util.Abort(_("fetch -r doesn't work for remote repositories yet")) |
|
61 | raise util.Abort(_("fetch -r doesn't work for remote repositories yet")) | |
62 | elif opts['rev']: |
|
62 | elif opts['rev']: | |
63 | revs = [other.lookup(rev) for rev in opts['rev']] |
|
63 | revs = [other.lookup(rev) for rev in opts['rev']] | |
64 | modheads = repo.pull(other, heads=revs) |
|
64 | modheads = repo.pull(other, heads=revs) | |
65 | return postincoming(other, modheads) |
|
65 | return postincoming(other, modheads) | |
66 |
|
66 | |||
67 | parent, p2 = repo.dirstate.parents() |
|
67 | parent, p2 = repo.dirstate.parents() | |
68 | if parent != repo.changelog.tip(): |
|
68 | if parent != repo.changelog.tip(): | |
69 | raise util.Abort(_('working dir not at tip ' |
|
69 | raise util.Abort(_('working dir not at tip ' | |
70 | '(use "hg update" to check out tip)')) |
|
70 | '(use "hg update" to check out tip)')) | |
71 | if p2 != nullid: |
|
71 | if p2 != nullid: | |
72 | raise util.Abort(_('outstanding uncommitted merge')) |
|
72 | raise util.Abort(_('outstanding uncommitted merge')) | |
73 | mod, add, rem = repo.status()[:3] |
|
73 | mod, add, rem = repo.status()[:3] | |
74 | if mod or add or rem: |
|
74 | if mod or add or rem: | |
75 | raise util.Abort(_('outstanding uncommitted changes')) |
|
75 | raise util.Abort(_('outstanding uncommitted changes')) | |
76 | if len(repo.heads()) > 1: |
|
76 | if len(repo.heads()) > 1: | |
77 | raise util.Abort(_('multiple heads in this repository ' |
|
77 | raise util.Abort(_('multiple heads in this repository ' | |
78 | '(use "hg heads" and "hg merge" to merge them)')) |
|
78 | '(use "hg heads" and "hg merge" to merge them)')) | |
79 | return pull() |
|
79 | return pull() | |
80 |
|
80 | |||
81 | cmdtable = { |
|
81 | cmdtable = { | |
82 | 'fetch': |
|
82 | 'fetch': | |
83 | (fetch, |
|
83 | (fetch, | |
84 | [('e', 'ssh', '', _('specify ssh command to use')), |
|
84 | [('e', 'ssh', '', _('specify ssh command to use')), | |
85 | ('m', 'message', '', _('use <text> as commit message')), |
|
85 | ('m', 'message', '', _('use <text> as commit message')), | |
86 | ('l', 'logfile', '', _('read the commit message from <file>')), |
|
86 | ('l', 'logfile', '', _('read the commit message from <file>')), | |
87 | ('d', 'date', '', _('record datecode as commit date')), |
|
87 | ('d', 'date', '', _('record datecode as commit date')), | |
88 | ('u', 'user', '', _('record user as commiter')), |
|
88 | ('u', 'user', '', _('record user as commiter')), | |
89 | ('r', 'rev', [], _('a specific revision you would like to pull')), |
|
89 | ('r', 'rev', [], _('a specific revision you would like to pull')), | |
90 | ('f', 'force-editor', None, _('edit commit message')), |
|
90 | ('f', 'force-editor', None, _('edit commit message')), | |
91 | ('', 'remotecmd', '', _('hg command to run on the remote side'))], |
|
91 | ('', 'remotecmd', '', _('hg command to run on the remote side'))], | |
92 | 'hg fetch [SOURCE]'), |
|
92 | 'hg fetch [SOURCE]'), | |
93 | } |
|
93 | } |
@@ -1,299 +1,299 b'' | |||||
1 | # bisect extension for mercurial |
|
1 | # bisect extension for mercurial | |
2 | # |
|
2 | # | |
3 | # Copyright 2005, 2006 Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|
3 | # Copyright 2005, 2006 Benoit Boissinot <benoit.boissinot@ens-lyon.org> | |
4 | # Inspired by git bisect, extension skeleton taken from mq.py. |
|
4 | # Inspired by git bisect, extension skeleton taken from mq.py. | |
5 | # |
|
5 | # | |
6 | # This software may be used and distributed according to the terms |
|
6 | # This software may be used and distributed according to the terms | |
7 | # of the GNU General Public License, incorporated herein by reference. |
|
7 | # of the GNU General Public License, incorporated herein by reference. | |
8 |
|
8 | |||
9 | from mercurial.i18n import gettext as _ |
|
9 | from mercurial.i18n import gettext as _ | |
10 | from mercurial.demandload import demandload |
|
10 | from mercurial.demandload import demandload | |
11 | demandload(globals(), "os sys sets mercurial:hg,util,commands") |
|
11 | demandload(globals(), "os sys sets mercurial:hg,util,commands") | |
12 |
|
12 | |||
13 | versionstr = "0.0.3" |
|
13 | versionstr = "0.0.3" | |
14 |
|
14 | |||
15 | def lookup_rev(ui, repo, rev=None): |
|
15 | def lookup_rev(ui, repo, rev=None): | |
16 | """returns rev or the checked-out revision if rev is None""" |
|
16 | """returns rev or the checked-out revision if rev is None""" | |
17 | if not rev is None: |
|
17 | if not rev is None: | |
18 | return repo.lookup(rev) |
|
18 | return repo.lookup(rev) | |
19 | parents = [p for p in repo.dirstate.parents() if p != hg.nullid] |
|
19 | parents = [p for p in repo.dirstate.parents() if p != hg.nullid] | |
20 | if len(parents) != 1: |
|
20 | if len(parents) != 1: | |
21 | raise util.Abort(_("unexpected number of parents, " |
|
21 | raise util.Abort(_("unexpected number of parents, " | |
22 | "please commit or revert")) |
|
22 | "please commit or revert")) | |
23 | return parents.pop() |
|
23 | return parents.pop() | |
24 |
|
24 | |||
25 | def check_clean(ui, repo): |
|
25 | def check_clean(ui, repo): | |
26 | modified, added, removed, deleted, unknown = repo.changes() |
|
26 | modified, added, removed, deleted, unknown = repo.changes() | |
27 | if modified or added or removed: |
|
27 | if modified or added or removed: | |
28 | ui.warn("Repository is not clean, please commit or revert\n") |
|
28 | ui.warn("Repository is not clean, please commit or revert\n") | |
29 | sys.exit(1) |
|
29 | sys.exit(1) | |
30 |
|
30 | |||
31 | class bisect(object): |
|
31 | class bisect(object): | |
32 | """dichotomic search in the DAG of changesets""" |
|
32 | """dichotomic search in the DAG of changesets""" | |
33 | def __init__(self, ui, repo): |
|
33 | def __init__(self, ui, repo): | |
34 | self.repo = repo |
|
34 | self.repo = repo | |
35 | self.path = repo.join("bisect") |
|
35 | self.path = repo.join("bisect") | |
36 | self.opener = util.opener(self.path) |
|
36 | self.opener = util.opener(self.path) | |
37 | self.ui = ui |
|
37 | self.ui = ui | |
38 | self.goodrevs = [] |
|
38 | self.goodrevs = [] | |
39 | self.badrev = None |
|
39 | self.badrev = None | |
40 | self.good_dirty = 0 |
|
40 | self.good_dirty = 0 | |
41 | self.bad_dirty = 0 |
|
41 | self.bad_dirty = 0 | |
42 | self.good_path = "good" |
|
42 | self.good_path = "good" | |
43 | self.bad_path = "bad" |
|
43 | self.bad_path = "bad" | |
44 |
|
44 | |||
45 | if os.path.exists(os.path.join(self.path, self.good_path)): |
|
45 | if os.path.exists(os.path.join(self.path, self.good_path)): | |
46 | self.goodrevs = self.opener(self.good_path).read().splitlines() |
|
46 | self.goodrevs = self.opener(self.good_path).read().splitlines() | |
47 | self.goodrevs = [hg.bin(x) for x in self.goodrevs] |
|
47 | self.goodrevs = [hg.bin(x) for x in self.goodrevs] | |
48 | if os.path.exists(os.path.join(self.path, self.bad_path)): |
|
48 | if os.path.exists(os.path.join(self.path, self.bad_path)): | |
49 | r = self.opener(self.bad_path).read().splitlines() |
|
49 | r = self.opener(self.bad_path).read().splitlines() | |
50 | if r: |
|
50 | if r: | |
51 | self.badrev = hg.bin(r.pop(0)) |
|
51 | self.badrev = hg.bin(r.pop(0)) | |
52 |
|
52 | |||
53 | def write(self): |
|
53 | def write(self): | |
54 | if not os.path.isdir(self.path): |
|
54 | if not os.path.isdir(self.path): | |
55 | return |
|
55 | return | |
56 | f = self.opener(self.good_path, "w") |
|
56 | f = self.opener(self.good_path, "w") | |
57 | f.write("\n".join([hg.hex(r) for r in self.goodrevs])) |
|
57 | f.write("\n".join([hg.hex(r) for r in self.goodrevs])) | |
58 | if len(self.goodrevs) > 0: |
|
58 | if len(self.goodrevs) > 0: | |
59 | f.write("\n") |
|
59 | f.write("\n") | |
60 | f = self.opener(self.bad_path, "w") |
|
60 | f = self.opener(self.bad_path, "w") | |
61 | if self.badrev: |
|
61 | if self.badrev: | |
62 | f.write(hg.hex(self.badrev) + "\n") |
|
62 | f.write(hg.hex(self.badrev) + "\n") | |
63 |
|
63 | |||
64 | def init(self): |
|
64 | def init(self): | |
65 | """start a new bisection""" |
|
65 | """start a new bisection""" | |
66 | if os.path.isdir(self.path): |
|
66 | if os.path.isdir(self.path): | |
67 | raise util.Abort(_("bisect directory already exists\n")) |
|
67 | raise util.Abort(_("bisect directory already exists\n")) | |
68 | os.mkdir(self.path) |
|
68 | os.mkdir(self.path) | |
69 | check_clean(self.ui, self.repo) |
|
69 | check_clean(self.ui, self.repo) | |
70 | return 0 |
|
70 | return 0 | |
71 |
|
71 | |||
72 | def reset(self): |
|
72 | def reset(self): | |
73 | """finish a bisection""" |
|
73 | """finish a bisection""" | |
74 | if os.path.isdir(self.path): |
|
74 | if os.path.isdir(self.path): | |
75 | sl = [os.path.join(self.path, p) |
|
75 | sl = [os.path.join(self.path, p) | |
76 | for p in [self.bad_path, self.good_path]] |
|
76 | for p in [self.bad_path, self.good_path]] | |
77 | for s in sl: |
|
77 | for s in sl: | |
78 | if os.path.exists(s): |
|
78 | if os.path.exists(s): | |
79 | os.unlink(s) |
|
79 | os.unlink(s) | |
80 | os.rmdir(self.path) |
|
80 | os.rmdir(self.path) | |
81 | # Not sure about this |
|
81 | # Not sure about this | |
82 | #self.ui.write("Going back to tip\n") |
|
82 | #self.ui.write("Going back to tip\n") | |
83 | #self.repo.update(self.repo.changelog.tip()) |
|
83 | #self.repo.update(self.repo.changelog.tip()) | |
84 | return 1 |
|
84 | return 1 | |
85 |
|
85 | |||
86 | def num_ancestors(self, head=None, stop=None): |
|
86 | def num_ancestors(self, head=None, stop=None): | |
87 | """ |
|
87 | """ | |
88 | returns a dict with the mapping: |
|
88 | returns a dict with the mapping: | |
89 | node -> number of ancestors (self included) |
|
89 | node -> number of ancestors (self included) | |
90 | for all nodes who are ancestor of head and |
|
90 | for all nodes who are ancestor of head and | |
91 | not in stop. |
|
91 | not in stop. | |
92 | """ |
|
92 | """ | |
93 | if head is None: |
|
93 | if head is None: | |
94 | head = self.badrev |
|
94 | head = self.badrev | |
95 | return self.__ancestors_and_nb_ancestors(head, stop)[1] |
|
95 | return self.__ancestors_and_nb_ancestors(head, stop)[1] | |
96 |
|
96 | |||
97 | def ancestors(self, head=None, stop=None): |
|
97 | def ancestors(self, head=None, stop=None): | |
98 | """ |
|
98 | """ | |
99 | returns the set of the ancestors of head (self included) |
|
99 | returns the set of the ancestors of head (self included) | |
100 | who are not in stop. |
|
100 | who are not in stop. | |
101 | """ |
|
101 | """ | |
102 | if head is None: |
|
102 | if head is None: | |
103 | head = self.badrev |
|
103 | head = self.badrev | |
104 | return self.__ancestors_and_nb_ancestors(head, stop)[0] |
|
104 | return self.__ancestors_and_nb_ancestors(head, stop)[0] | |
105 |
|
105 | |||
106 | def __ancestors_and_nb_ancestors(self, head, stop=None): |
|
106 | def __ancestors_and_nb_ancestors(self, head, stop=None): | |
107 | """ |
|
107 | """ | |
108 | if stop is None then ancestors of goodrevs are used as |
|
108 | if stop is None then ancestors of goodrevs are used as | |
109 | lower limit. |
|
109 | lower limit. | |
110 |
|
110 | |||
111 | returns (anc, n_child) where anc is the set of the ancestors of head |
|
111 | returns (anc, n_child) where anc is the set of the ancestors of head | |
112 | and n_child is a dictionary with the following mapping: |
|
112 | and n_child is a dictionary with the following mapping: | |
113 | node -> number of ancestors (self included) |
|
113 | node -> number of ancestors (self included) | |
114 | """ |
|
114 | """ | |
115 | cl = self.repo.changelog |
|
115 | cl = self.repo.changelog | |
116 | if not stop: |
|
116 | if not stop: | |
117 | stop = sets.Set([]) |
|
117 | stop = sets.Set([]) | |
118 | for i in xrange(len(self.goodrevs)-1, -1, -1): |
|
118 | for i in xrange(len(self.goodrevs)-1, -1, -1): | |
119 | g = self.goodrevs[i] |
|
119 | g = self.goodrevs[i] | |
120 | if g in stop: |
|
120 | if g in stop: | |
121 | continue |
|
121 | continue | |
122 | stop.update(cl.reachable(g)) |
|
122 | stop.update(cl.reachable(g)) | |
123 | def num_children(a): |
|
123 | def num_children(a): | |
124 | """ |
|
124 | """ | |
125 | returns a dictionnary with the following mapping |
|
125 | returns a dictionnary with the following mapping | |
126 | node -> [number of children, empty set] |
|
126 | node -> [number of children, empty set] | |
127 | """ |
|
127 | """ | |
128 | d = {a: [0, sets.Set([])]} |
|
128 | d = {a: [0, sets.Set([])]} | |
129 | for i in xrange(cl.rev(a)+1): |
|
129 | for i in xrange(cl.rev(a)+1): | |
130 | n = cl.node(i) |
|
130 | n = cl.node(i) | |
131 | if not d.has_key(n): |
|
131 | if not d.has_key(n): | |
132 | d[n] = [0, sets.Set([])] |
|
132 | d[n] = [0, sets.Set([])] | |
133 | parents = [p for p in cl.parents(n) if p != hg.nullid] |
|
133 | parents = [p for p in cl.parents(n) if p != hg.nullid] | |
134 | for p in parents: |
|
134 | for p in parents: | |
135 | d[p][0] += 1 |
|
135 | d[p][0] += 1 | |
136 | return d |
|
136 | return d | |
137 |
|
137 | |||
138 | if head in stop: |
|
138 | if head in stop: | |
139 | raise util.Abort(_("Unconsistent state, %s:%s is good and bad") |
|
139 | raise util.Abort(_("Unconsistent state, %s:%s is good and bad") | |
140 | % (cl.rev(head), hg.short(head))) |
|
140 | % (cl.rev(head), hg.short(head))) | |
141 | n_child = num_children(head) |
|
141 | n_child = num_children(head) | |
142 | for i in xrange(cl.rev(head)+1): |
|
142 | for i in xrange(cl.rev(head)+1): | |
143 | n = cl.node(i) |
|
143 | n = cl.node(i) | |
144 | parents = [p for p in cl.parents(n) if p != hg.nullid] |
|
144 | parents = [p for p in cl.parents(n) if p != hg.nullid] | |
145 | for p in parents: |
|
145 | for p in parents: | |
146 | n_child[p][0] -= 1 |
|
146 | n_child[p][0] -= 1 | |
147 | if not n in stop: |
|
147 | if not n in stop: | |
148 | n_child[n][1].union_update(n_child[p][1]) |
|
148 | n_child[n][1].union_update(n_child[p][1]) | |
149 | if n_child[p][0] == 0: |
|
149 | if n_child[p][0] == 0: | |
150 | n_child[p] = len(n_child[p][1]) |
|
150 | n_child[p] = len(n_child[p][1]) | |
151 | if not n in stop: |
|
151 | if not n in stop: | |
152 | n_child[n][1].add(n) |
|
152 | n_child[n][1].add(n) | |
153 | if n_child[n][0] == 0: |
|
153 | if n_child[n][0] == 0: | |
154 | if n == head: |
|
154 | if n == head: | |
155 | anc = n_child[n][1] |
|
155 | anc = n_child[n][1] | |
156 | n_child[n] = len(n_child[n][1]) |
|
156 | n_child[n] = len(n_child[n][1]) | |
157 | return anc, n_child |
|
157 | return anc, n_child | |
158 |
|
158 | |||
159 | def next(self): |
|
159 | def next(self): | |
160 | if not self.badrev: |
|
160 | if not self.badrev: | |
161 | raise util.Abort(_("You should give at least one bad revision")) |
|
161 | raise util.Abort(_("You should give at least one bad revision")) | |
162 | if not self.goodrevs: |
|
162 | if not self.goodrevs: | |
163 | self.ui.warn(_("No good revision given\n")) |
|
163 | self.ui.warn(_("No good revision given\n")) | |
164 | self.ui.warn(_("Marking the first revision as good\n")) |
|
164 | self.ui.warn(_("Marking the first revision as good\n")) | |
165 | ancestors, num_ancestors = self.__ancestors_and_nb_ancestors( |
|
165 | ancestors, num_ancestors = self.__ancestors_and_nb_ancestors( | |
166 | self.badrev) |
|
166 | self.badrev) | |
167 | tot = len(ancestors) |
|
167 | tot = len(ancestors) | |
168 | if tot == 1: |
|
168 | if tot == 1: | |
169 | if ancestors.pop() != self.badrev: |
|
169 | if ancestors.pop() != self.badrev: | |
170 | raise util.Abort(_("Could not find the first bad revision")) |
|
170 | raise util.Abort(_("Could not find the first bad revision")) | |
171 | self.ui.write(_("The first bad revision is:\n")) |
|
171 | self.ui.write(_("The first bad revision is:\n")) | |
172 | displayer = commands.show_changeset(self.ui, self.repo, {}) |
|
172 | displayer = commands.show_changeset(self.ui, self.repo, {}) | |
173 | displayer.show(changenode=self.badrev) |
|
173 | displayer.show(changenode=self.badrev) | |
174 | return None |
|
174 | return None | |
175 | best_rev = None |
|
175 | best_rev = None | |
176 | best_len = -1 |
|
176 | best_len = -1 | |
177 | for n in ancestors: |
|
177 | for n in ancestors: | |
178 | l = num_ancestors[n] |
|
178 | l = num_ancestors[n] | |
179 | l = min(l, tot - l) |
|
179 | l = min(l, tot - l) | |
180 | if l > best_len: |
|
180 | if l > best_len: | |
181 | best_len = l |
|
181 | best_len = l | |
182 | best_rev = n |
|
182 | best_rev = n | |
183 | assert best_rev is not None |
|
183 | assert best_rev is not None | |
184 | nb_tests = 0 |
|
184 | nb_tests = 0 | |
185 | q, r = divmod(tot, 2) |
|
185 | q, r = divmod(tot, 2) | |
186 | while q: |
|
186 | while q: | |
187 | nb_tests += 1 |
|
187 | nb_tests += 1 | |
188 | q, r = divmod(q, 2) |
|
188 | q, r = divmod(q, 2) | |
189 | msg = _("Testing changeset %s:%s (%s changesets remaining, " |
|
189 | msg = _("Testing changeset %s:%s (%s changesets remaining, " | |
190 | "~%s tests)\n") % (self.repo.changelog.rev(best_rev), |
|
190 | "~%s tests)\n") % (self.repo.changelog.rev(best_rev), | |
191 | hg.short(best_rev), tot, nb_tests) |
|
191 | hg.short(best_rev), tot, nb_tests) | |
192 | self.ui.write(msg) |
|
192 | self.ui.write(msg) | |
193 | return best_rev |
|
193 | return best_rev | |
194 |
|
194 | |||
195 | def autonext(self): |
|
195 | def autonext(self): | |
196 | """find and update to the next revision to test""" |
|
196 | """find and update to the next revision to test""" | |
197 | check_clean(self.ui, self.repo) |
|
197 | check_clean(self.ui, self.repo) | |
198 | rev = self.next() |
|
198 | rev = self.next() | |
199 | if rev is not None: |
|
199 | if rev is not None: | |
200 |
return hg. |
|
200 | return hg.clean(self.repo, rev) | |
201 |
|
201 | |||
202 | def good(self, rev): |
|
202 | def good(self, rev): | |
203 | self.goodrevs.append(rev) |
|
203 | self.goodrevs.append(rev) | |
204 |
|
204 | |||
205 | def autogood(self, rev=None): |
|
205 | def autogood(self, rev=None): | |
206 | """mark revision as good and update to the next revision to test""" |
|
206 | """mark revision as good and update to the next revision to test""" | |
207 | check_clean(self.ui, self.repo) |
|
207 | check_clean(self.ui, self.repo) | |
208 | rev = lookup_rev(self.ui, self.repo, rev) |
|
208 | rev = lookup_rev(self.ui, self.repo, rev) | |
209 | self.good(rev) |
|
209 | self.good(rev) | |
210 | if self.badrev: |
|
210 | if self.badrev: | |
211 | return self.autonext() |
|
211 | return self.autonext() | |
212 |
|
212 | |||
213 | def bad(self, rev): |
|
213 | def bad(self, rev): | |
214 | self.badrev = rev |
|
214 | self.badrev = rev | |
215 |
|
215 | |||
216 | def autobad(self, rev=None): |
|
216 | def autobad(self, rev=None): | |
217 | """mark revision as bad and update to the next revision to test""" |
|
217 | """mark revision as bad and update to the next revision to test""" | |
218 | check_clean(self.ui, self.repo) |
|
218 | check_clean(self.ui, self.repo) | |
219 | rev = lookup_rev(self.ui, self.repo, rev) |
|
219 | rev = lookup_rev(self.ui, self.repo, rev) | |
220 | self.bad(rev) |
|
220 | self.bad(rev) | |
221 | if self.goodrevs: |
|
221 | if self.goodrevs: | |
222 | self.autonext() |
|
222 | self.autonext() | |
223 |
|
223 | |||
224 | # should we put it in the class ? |
|
224 | # should we put it in the class ? | |
225 | def test(ui, repo, rev): |
|
225 | def test(ui, repo, rev): | |
226 | """test the bisection code""" |
|
226 | """test the bisection code""" | |
227 | b = bisect(ui, repo) |
|
227 | b = bisect(ui, repo) | |
228 | rev = repo.lookup(rev) |
|
228 | rev = repo.lookup(rev) | |
229 | ui.write("testing with rev %s\n" % hg.hex(rev)) |
|
229 | ui.write("testing with rev %s\n" % hg.hex(rev)) | |
230 | anc = b.ancestors() |
|
230 | anc = b.ancestors() | |
231 | while len(anc) > 1: |
|
231 | while len(anc) > 1: | |
232 | if not rev in anc: |
|
232 | if not rev in anc: | |
233 | ui.warn("failure while bisecting\n") |
|
233 | ui.warn("failure while bisecting\n") | |
234 | sys.exit(1) |
|
234 | sys.exit(1) | |
235 | ui.write("it worked :)\n") |
|
235 | ui.write("it worked :)\n") | |
236 | new_rev = b.next() |
|
236 | new_rev = b.next() | |
237 | ui.write("choosing if good or bad\n") |
|
237 | ui.write("choosing if good or bad\n") | |
238 | if rev in b.ancestors(head=new_rev): |
|
238 | if rev in b.ancestors(head=new_rev): | |
239 | b.bad(new_rev) |
|
239 | b.bad(new_rev) | |
240 | ui.write("it is bad\n") |
|
240 | ui.write("it is bad\n") | |
241 | else: |
|
241 | else: | |
242 | b.good(new_rev) |
|
242 | b.good(new_rev) | |
243 | ui.write("it is good\n") |
|
243 | ui.write("it is good\n") | |
244 | anc = b.ancestors() |
|
244 | anc = b.ancestors() | |
245 | #repo.update(new_rev, force=True) |
|
245 | #repo.update(new_rev, force=True) | |
246 | for v in anc: |
|
246 | for v in anc: | |
247 | if v != rev: |
|
247 | if v != rev: | |
248 | ui.warn("fail to found cset! :(\n") |
|
248 | ui.warn("fail to found cset! :(\n") | |
249 | return 1 |
|
249 | return 1 | |
250 | ui.write("Found bad cset: %s\n" % hg.hex(b.badrev)) |
|
250 | ui.write("Found bad cset: %s\n" % hg.hex(b.badrev)) | |
251 | ui.write("Everything is ok :)\n") |
|
251 | ui.write("Everything is ok :)\n") | |
252 | return 0 |
|
252 | return 0 | |
253 |
|
253 | |||
254 | def bisect_run(ui, repo, cmd=None, *args): |
|
254 | def bisect_run(ui, repo, cmd=None, *args): | |
255 | """bisect extension: dichotomic search in the DAG of changesets |
|
255 | """bisect extension: dichotomic search in the DAG of changesets | |
256 | for subcommands see "hg bisect help\" |
|
256 | for subcommands see "hg bisect help\" | |
257 | """ |
|
257 | """ | |
258 | def help_(cmd=None, *args): |
|
258 | def help_(cmd=None, *args): | |
259 | """show help for a given bisect subcommand or all subcommands""" |
|
259 | """show help for a given bisect subcommand or all subcommands""" | |
260 | cmdtable = bisectcmdtable |
|
260 | cmdtable = bisectcmdtable | |
261 | if cmd: |
|
261 | if cmd: | |
262 | doc = cmdtable[cmd][0].__doc__ |
|
262 | doc = cmdtable[cmd][0].__doc__ | |
263 | synopsis = cmdtable[cmd][2] |
|
263 | synopsis = cmdtable[cmd][2] | |
264 | ui.write(synopsis + "\n") |
|
264 | ui.write(synopsis + "\n") | |
265 | ui.write("\n" + doc + "\n") |
|
265 | ui.write("\n" + doc + "\n") | |
266 | return |
|
266 | return | |
267 | ui.write(_("list of subcommands for the bisect extension\n\n")) |
|
267 | ui.write(_("list of subcommands for the bisect extension\n\n")) | |
268 | cmds = cmdtable.keys() |
|
268 | cmds = cmdtable.keys() | |
269 | cmds.sort() |
|
269 | cmds.sort() | |
270 | m = max([len(c) for c in cmds]) |
|
270 | m = max([len(c) for c in cmds]) | |
271 | for cmd in cmds: |
|
271 | for cmd in cmds: | |
272 | doc = cmdtable[cmd][0].__doc__.splitlines(0)[0].rstrip() |
|
272 | doc = cmdtable[cmd][0].__doc__.splitlines(0)[0].rstrip() | |
273 | ui.write(" %-*s %s\n" % (m, cmd, doc)) |
|
273 | ui.write(" %-*s %s\n" % (m, cmd, doc)) | |
274 |
|
274 | |||
275 | b = bisect(ui, repo) |
|
275 | b = bisect(ui, repo) | |
276 | bisectcmdtable = { |
|
276 | bisectcmdtable = { | |
277 | "init": (b.init, 0, _("hg bisect init")), |
|
277 | "init": (b.init, 0, _("hg bisect init")), | |
278 | "bad": (b.autobad, 1, _("hg bisect bad [<rev>]")), |
|
278 | "bad": (b.autobad, 1, _("hg bisect bad [<rev>]")), | |
279 | "good": (b.autogood, 1, _("hg bisect good [<rev>]")), |
|
279 | "good": (b.autogood, 1, _("hg bisect good [<rev>]")), | |
280 | "next": (b.autonext, 0, _("hg bisect next")), |
|
280 | "next": (b.autonext, 0, _("hg bisect next")), | |
281 | "reset": (b.reset, 0, _("hg bisect reset")), |
|
281 | "reset": (b.reset, 0, _("hg bisect reset")), | |
282 | "help": (help_, 1, _("hg bisect help [<subcommand>]")), |
|
282 | "help": (help_, 1, _("hg bisect help [<subcommand>]")), | |
283 | } |
|
283 | } | |
284 |
|
284 | |||
285 | if not bisectcmdtable.has_key(cmd): |
|
285 | if not bisectcmdtable.has_key(cmd): | |
286 | ui.warn(_("bisect: Unknown sub-command\n")) |
|
286 | ui.warn(_("bisect: Unknown sub-command\n")) | |
287 | return help_() |
|
287 | return help_() | |
288 | if len(args) > bisectcmdtable[cmd][1]: |
|
288 | if len(args) > bisectcmdtable[cmd][1]: | |
289 | ui.warn(_("bisect: Too many arguments\n")) |
|
289 | ui.warn(_("bisect: Too many arguments\n")) | |
290 | return help_() |
|
290 | return help_() | |
291 | try: |
|
291 | try: | |
292 | return bisectcmdtable[cmd][0](*args) |
|
292 | return bisectcmdtable[cmd][0](*args) | |
293 | finally: |
|
293 | finally: | |
294 | b.write() |
|
294 | b.write() | |
295 |
|
295 | |||
296 | cmdtable = { |
|
296 | cmdtable = { | |
297 | "bisect": (bisect_run, [], _("hg bisect [help|init|reset|next|good|bad]")), |
|
297 | "bisect": (bisect_run, [], _("hg bisect [help|init|reset|next|good|bad]")), | |
298 | #"bisect-test": (test, [], "hg bisect-test rev"), |
|
298 | #"bisect-test": (test, [], "hg bisect-test rev"), | |
299 | } |
|
299 | } |
@@ -1,1677 +1,1677 b'' | |||||
1 |
|
1 | |||
2 | # queue.py - patch queues for mercurial |
|
2 | # queue.py - patch queues for mercurial | |
3 | # |
|
3 | # | |
4 | # Copyright 2005 Chris Mason <mason@suse.com> |
|
4 | # Copyright 2005 Chris Mason <mason@suse.com> | |
5 | # |
|
5 | # | |
6 | # This software may be used and distributed according to the terms |
|
6 | # This software may be used and distributed according to the terms | |
7 | # of the GNU General Public License, incorporated herein by reference. |
|
7 | # of the GNU General Public License, incorporated herein by reference. | |
8 |
|
8 | |||
9 | '''patch management and development |
|
9 | '''patch management and development | |
10 |
|
10 | |||
11 | This extension lets you work with a stack of patches in a Mercurial |
|
11 | This extension lets you work with a stack of patches in a Mercurial | |
12 | repository. It manages two stacks of patches - all known patches, and |
|
12 | repository. It manages two stacks of patches - all known patches, and | |
13 | applied patches (subset of known patches). |
|
13 | applied patches (subset of known patches). | |
14 |
|
14 | |||
15 | Known patches are represented as patch files in the .hg/patches |
|
15 | Known patches are represented as patch files in the .hg/patches | |
16 | directory. Applied patches are both patch files and changesets. |
|
16 | directory. Applied patches are both patch files and changesets. | |
17 |
|
17 | |||
18 | Common tasks (use "hg help command" for more details): |
|
18 | Common tasks (use "hg help command" for more details): | |
19 |
|
19 | |||
20 | prepare repository to work with patches qinit |
|
20 | prepare repository to work with patches qinit | |
21 | create new patch qnew |
|
21 | create new patch qnew | |
22 | import existing patch qimport |
|
22 | import existing patch qimport | |
23 |
|
23 | |||
24 | print patch series qseries |
|
24 | print patch series qseries | |
25 | print applied patches qapplied |
|
25 | print applied patches qapplied | |
26 | print name of top applied patch qtop |
|
26 | print name of top applied patch qtop | |
27 |
|
27 | |||
28 | add known patch to applied stack qpush |
|
28 | add known patch to applied stack qpush | |
29 | remove patch from applied stack qpop |
|
29 | remove patch from applied stack qpop | |
30 | refresh contents of top applied patch qrefresh |
|
30 | refresh contents of top applied patch qrefresh | |
31 | ''' |
|
31 | ''' | |
32 |
|
32 | |||
33 | from mercurial.demandload import * |
|
33 | from mercurial.demandload import * | |
34 | demandload(globals(), "os sys re struct traceback errno bz2") |
|
34 | demandload(globals(), "os sys re struct traceback errno bz2") | |
35 | from mercurial.i18n import gettext as _ |
|
35 | from mercurial.i18n import gettext as _ | |
36 | from mercurial import ui, hg, revlog, commands, util |
|
36 | from mercurial import ui, hg, revlog, commands, util | |
37 |
|
37 | |||
38 | versionstr = "0.45" |
|
38 | versionstr = "0.45" | |
39 |
|
39 | |||
40 | commands.norepo += " qclone qversion" |
|
40 | commands.norepo += " qclone qversion" | |
41 |
|
41 | |||
42 | class StatusEntry: |
|
42 | class StatusEntry: | |
43 | def __init__(self, rev, name=None): |
|
43 | def __init__(self, rev, name=None): | |
44 | if not name: |
|
44 | if not name: | |
45 | self.rev, self.name = rev.split(':') |
|
45 | self.rev, self.name = rev.split(':') | |
46 | else: |
|
46 | else: | |
47 | self.rev, self.name = rev, name |
|
47 | self.rev, self.name = rev, name | |
48 |
|
48 | |||
49 | def __str__(self): |
|
49 | def __str__(self): | |
50 | return self.rev + ':' + self.name |
|
50 | return self.rev + ':' + self.name | |
51 |
|
51 | |||
52 | class queue: |
|
52 | class queue: | |
53 | def __init__(self, ui, path, patchdir=None): |
|
53 | def __init__(self, ui, path, patchdir=None): | |
54 | self.basepath = path |
|
54 | self.basepath = path | |
55 | if patchdir: |
|
55 | if patchdir: | |
56 | self.path = patchdir |
|
56 | self.path = patchdir | |
57 | else: |
|
57 | else: | |
58 | self.path = os.path.join(path, "patches") |
|
58 | self.path = os.path.join(path, "patches") | |
59 | self.opener = util.opener(self.path) |
|
59 | self.opener = util.opener(self.path) | |
60 | self.ui = ui |
|
60 | self.ui = ui | |
61 | self.applied = [] |
|
61 | self.applied = [] | |
62 | self.full_series = [] |
|
62 | self.full_series = [] | |
63 | self.applied_dirty = 0 |
|
63 | self.applied_dirty = 0 | |
64 | self.series_dirty = 0 |
|
64 | self.series_dirty = 0 | |
65 | self.series_path = "series" |
|
65 | self.series_path = "series" | |
66 | self.status_path = "status" |
|
66 | self.status_path = "status" | |
67 |
|
67 | |||
68 | if os.path.exists(os.path.join(self.path, self.series_path)): |
|
68 | if os.path.exists(os.path.join(self.path, self.series_path)): | |
69 | self.full_series = self.opener(self.series_path).read().splitlines() |
|
69 | self.full_series = self.opener(self.series_path).read().splitlines() | |
70 | self.parse_series() |
|
70 | self.parse_series() | |
71 |
|
71 | |||
72 | if os.path.exists(os.path.join(self.path, self.status_path)): |
|
72 | if os.path.exists(os.path.join(self.path, self.status_path)): | |
73 | self.applied = [StatusEntry(l) |
|
73 | self.applied = [StatusEntry(l) | |
74 | for l in self.opener(self.status_path).read().splitlines()] |
|
74 | for l in self.opener(self.status_path).read().splitlines()] | |
75 |
|
75 | |||
76 | def find_series(self, patch): |
|
76 | def find_series(self, patch): | |
77 | pre = re.compile("(\s*)([^#]+)") |
|
77 | pre = re.compile("(\s*)([^#]+)") | |
78 | index = 0 |
|
78 | index = 0 | |
79 | for l in self.full_series: |
|
79 | for l in self.full_series: | |
80 | m = pre.match(l) |
|
80 | m = pre.match(l) | |
81 | if m: |
|
81 | if m: | |
82 | s = m.group(2) |
|
82 | s = m.group(2) | |
83 | s = s.rstrip() |
|
83 | s = s.rstrip() | |
84 | if s == patch: |
|
84 | if s == patch: | |
85 | return index |
|
85 | return index | |
86 | index += 1 |
|
86 | index += 1 | |
87 | return None |
|
87 | return None | |
88 |
|
88 | |||
89 | def parse_series(self): |
|
89 | def parse_series(self): | |
90 | self.series = [] |
|
90 | self.series = [] | |
91 | for l in self.full_series: |
|
91 | for l in self.full_series: | |
92 | s = l.split('#', 1)[0].strip() |
|
92 | s = l.split('#', 1)[0].strip() | |
93 | if s: |
|
93 | if s: | |
94 | self.series.append(s) |
|
94 | self.series.append(s) | |
95 |
|
95 | |||
96 | def save_dirty(self): |
|
96 | def save_dirty(self): | |
97 | def write_list(items, path): |
|
97 | def write_list(items, path): | |
98 | fp = self.opener(path, 'w') |
|
98 | fp = self.opener(path, 'w') | |
99 | for i in items: |
|
99 | for i in items: | |
100 | print >> fp, i |
|
100 | print >> fp, i | |
101 | fp.close() |
|
101 | fp.close() | |
102 | if self.applied_dirty: write_list(map(str, self.applied), self.status_path) |
|
102 | if self.applied_dirty: write_list(map(str, self.applied), self.status_path) | |
103 | if self.series_dirty: write_list(self.full_series, self.series_path) |
|
103 | if self.series_dirty: write_list(self.full_series, self.series_path) | |
104 |
|
104 | |||
105 | def readheaders(self, patch): |
|
105 | def readheaders(self, patch): | |
106 | def eatdiff(lines): |
|
106 | def eatdiff(lines): | |
107 | while lines: |
|
107 | while lines: | |
108 | l = lines[-1] |
|
108 | l = lines[-1] | |
109 | if (l.startswith("diff -") or |
|
109 | if (l.startswith("diff -") or | |
110 | l.startswith("Index:") or |
|
110 | l.startswith("Index:") or | |
111 | l.startswith("===========")): |
|
111 | l.startswith("===========")): | |
112 | del lines[-1] |
|
112 | del lines[-1] | |
113 | else: |
|
113 | else: | |
114 | break |
|
114 | break | |
115 | def eatempty(lines): |
|
115 | def eatempty(lines): | |
116 | while lines: |
|
116 | while lines: | |
117 | l = lines[-1] |
|
117 | l = lines[-1] | |
118 | if re.match('\s*$', l): |
|
118 | if re.match('\s*$', l): | |
119 | del lines[-1] |
|
119 | del lines[-1] | |
120 | else: |
|
120 | else: | |
121 | break |
|
121 | break | |
122 |
|
122 | |||
123 | pf = os.path.join(self.path, patch) |
|
123 | pf = os.path.join(self.path, patch) | |
124 | message = [] |
|
124 | message = [] | |
125 | comments = [] |
|
125 | comments = [] | |
126 | user = None |
|
126 | user = None | |
127 | date = None |
|
127 | date = None | |
128 | format = None |
|
128 | format = None | |
129 | subject = None |
|
129 | subject = None | |
130 | diffstart = 0 |
|
130 | diffstart = 0 | |
131 |
|
131 | |||
132 | for line in file(pf): |
|
132 | for line in file(pf): | |
133 | line = line.rstrip() |
|
133 | line = line.rstrip() | |
134 | if diffstart: |
|
134 | if diffstart: | |
135 | if line.startswith('+++ '): |
|
135 | if line.startswith('+++ '): | |
136 | diffstart = 2 |
|
136 | diffstart = 2 | |
137 | break |
|
137 | break | |
138 | if line.startswith("--- "): |
|
138 | if line.startswith("--- "): | |
139 | diffstart = 1 |
|
139 | diffstart = 1 | |
140 | continue |
|
140 | continue | |
141 | elif format == "hgpatch": |
|
141 | elif format == "hgpatch": | |
142 | # parse values when importing the result of an hg export |
|
142 | # parse values when importing the result of an hg export | |
143 | if line.startswith("# User "): |
|
143 | if line.startswith("# User "): | |
144 | user = line[7:] |
|
144 | user = line[7:] | |
145 | elif line.startswith("# Date "): |
|
145 | elif line.startswith("# Date "): | |
146 | date = line[7:] |
|
146 | date = line[7:] | |
147 | elif not line.startswith("# ") and line: |
|
147 | elif not line.startswith("# ") and line: | |
148 | message.append(line) |
|
148 | message.append(line) | |
149 | format = None |
|
149 | format = None | |
150 | elif line == '# HG changeset patch': |
|
150 | elif line == '# HG changeset patch': | |
151 | format = "hgpatch" |
|
151 | format = "hgpatch" | |
152 | elif (format != "tagdone" and (line.startswith("Subject: ") or |
|
152 | elif (format != "tagdone" and (line.startswith("Subject: ") or | |
153 | line.startswith("subject: "))): |
|
153 | line.startswith("subject: "))): | |
154 | subject = line[9:] |
|
154 | subject = line[9:] | |
155 | format = "tag" |
|
155 | format = "tag" | |
156 | elif (format != "tagdone" and (line.startswith("From: ") or |
|
156 | elif (format != "tagdone" and (line.startswith("From: ") or | |
157 | line.startswith("from: "))): |
|
157 | line.startswith("from: "))): | |
158 | user = line[6:] |
|
158 | user = line[6:] | |
159 | format = "tag" |
|
159 | format = "tag" | |
160 | elif format == "tag" and line == "": |
|
160 | elif format == "tag" and line == "": | |
161 | # when looking for tags (subject: from: etc) they |
|
161 | # when looking for tags (subject: from: etc) they | |
162 | # end once you find a blank line in the source |
|
162 | # end once you find a blank line in the source | |
163 | format = "tagdone" |
|
163 | format = "tagdone" | |
164 | elif message or line: |
|
164 | elif message or line: | |
165 | message.append(line) |
|
165 | message.append(line) | |
166 | comments.append(line) |
|
166 | comments.append(line) | |
167 |
|
167 | |||
168 | eatdiff(message) |
|
168 | eatdiff(message) | |
169 | eatdiff(comments) |
|
169 | eatdiff(comments) | |
170 | eatempty(message) |
|
170 | eatempty(message) | |
171 | eatempty(comments) |
|
171 | eatempty(comments) | |
172 |
|
172 | |||
173 | # make sure message isn't empty |
|
173 | # make sure message isn't empty | |
174 | if format and format.startswith("tag") and subject: |
|
174 | if format and format.startswith("tag") and subject: | |
175 | message.insert(0, "") |
|
175 | message.insert(0, "") | |
176 | message.insert(0, subject) |
|
176 | message.insert(0, subject) | |
177 | return (message, comments, user, date, diffstart > 1) |
|
177 | return (message, comments, user, date, diffstart > 1) | |
178 |
|
178 | |||
179 | def mergeone(self, repo, mergeq, head, patch, rev, wlock): |
|
179 | def mergeone(self, repo, mergeq, head, patch, rev, wlock): | |
180 | # first try just applying the patch |
|
180 | # first try just applying the patch | |
181 | (err, n) = self.apply(repo, [ patch ], update_status=False, |
|
181 | (err, n) = self.apply(repo, [ patch ], update_status=False, | |
182 | strict=True, merge=rev, wlock=wlock) |
|
182 | strict=True, merge=rev, wlock=wlock) | |
183 |
|
183 | |||
184 | if err == 0: |
|
184 | if err == 0: | |
185 | return (err, n) |
|
185 | return (err, n) | |
186 |
|
186 | |||
187 | if n is None: |
|
187 | if n is None: | |
188 | raise util.Abort(_("apply failed for patch %s") % patch) |
|
188 | raise util.Abort(_("apply failed for patch %s") % patch) | |
189 |
|
189 | |||
190 | self.ui.warn("patch didn't work out, merging %s\n" % patch) |
|
190 | self.ui.warn("patch didn't work out, merging %s\n" % patch) | |
191 |
|
191 | |||
192 | # apply failed, strip away that rev and merge. |
|
192 | # apply failed, strip away that rev and merge. | |
193 |
hg. |
|
193 | hg.clean(repo, head, wlock=wlock) | |
194 | self.strip(repo, n, update=False, backup='strip', wlock=wlock) |
|
194 | self.strip(repo, n, update=False, backup='strip', wlock=wlock) | |
195 |
|
195 | |||
196 | c = repo.changelog.read(rev) |
|
196 | c = repo.changelog.read(rev) | |
197 |
ret = hg. |
|
197 | ret = hg.merge(repo, rev, wlock=wlock) | |
198 | if ret: |
|
198 | if ret: | |
199 | raise util.Abort(_("update returned %d") % ret) |
|
199 | raise util.Abort(_("update returned %d") % ret) | |
200 | n = repo.commit(None, c[4], c[1], force=1, wlock=wlock) |
|
200 | n = repo.commit(None, c[4], c[1], force=1, wlock=wlock) | |
201 | if n == None: |
|
201 | if n == None: | |
202 | raise util.Abort(_("repo commit failed")) |
|
202 | raise util.Abort(_("repo commit failed")) | |
203 | try: |
|
203 | try: | |
204 | message, comments, user, date, patchfound = mergeq.readheaders(patch) |
|
204 | message, comments, user, date, patchfound = mergeq.readheaders(patch) | |
205 | except: |
|
205 | except: | |
206 | raise util.Abort(_("unable to read %s") % patch) |
|
206 | raise util.Abort(_("unable to read %s") % patch) | |
207 |
|
207 | |||
208 | patchf = self.opener(patch, "w") |
|
208 | patchf = self.opener(patch, "w") | |
209 | if comments: |
|
209 | if comments: | |
210 | comments = "\n".join(comments) + '\n\n' |
|
210 | comments = "\n".join(comments) + '\n\n' | |
211 | patchf.write(comments) |
|
211 | patchf.write(comments) | |
212 | commands.dodiff(patchf, self.ui, repo, head, n) |
|
212 | commands.dodiff(patchf, self.ui, repo, head, n) | |
213 | patchf.close() |
|
213 | patchf.close() | |
214 | return (0, n) |
|
214 | return (0, n) | |
215 |
|
215 | |||
216 | def qparents(self, repo, rev=None): |
|
216 | def qparents(self, repo, rev=None): | |
217 | if rev is None: |
|
217 | if rev is None: | |
218 | (p1, p2) = repo.dirstate.parents() |
|
218 | (p1, p2) = repo.dirstate.parents() | |
219 | if p2 == revlog.nullid: |
|
219 | if p2 == revlog.nullid: | |
220 | return p1 |
|
220 | return p1 | |
221 | if len(self.applied) == 0: |
|
221 | if len(self.applied) == 0: | |
222 | return None |
|
222 | return None | |
223 | return revlog.bin(self.applied[-1].rev) |
|
223 | return revlog.bin(self.applied[-1].rev) | |
224 | pp = repo.changelog.parents(rev) |
|
224 | pp = repo.changelog.parents(rev) | |
225 | if pp[1] != revlog.nullid: |
|
225 | if pp[1] != revlog.nullid: | |
226 | arevs = [ x.rev for x in self.applied ] |
|
226 | arevs = [ x.rev for x in self.applied ] | |
227 | p0 = revlog.hex(pp[0]) |
|
227 | p0 = revlog.hex(pp[0]) | |
228 | p1 = revlog.hex(pp[1]) |
|
228 | p1 = revlog.hex(pp[1]) | |
229 | if p0 in arevs: |
|
229 | if p0 in arevs: | |
230 | return pp[0] |
|
230 | return pp[0] | |
231 | if p1 in arevs: |
|
231 | if p1 in arevs: | |
232 | return pp[1] |
|
232 | return pp[1] | |
233 | return pp[0] |
|
233 | return pp[0] | |
234 |
|
234 | |||
235 | def mergepatch(self, repo, mergeq, series, wlock): |
|
235 | def mergepatch(self, repo, mergeq, series, wlock): | |
236 | if len(self.applied) == 0: |
|
236 | if len(self.applied) == 0: | |
237 | # each of the patches merged in will have two parents. This |
|
237 | # each of the patches merged in will have two parents. This | |
238 | # can confuse the qrefresh, qdiff, and strip code because it |
|
238 | # can confuse the qrefresh, qdiff, and strip code because it | |
239 | # needs to know which parent is actually in the patch queue. |
|
239 | # needs to know which parent is actually in the patch queue. | |
240 | # so, we insert a merge marker with only one parent. This way |
|
240 | # so, we insert a merge marker with only one parent. This way | |
241 | # the first patch in the queue is never a merge patch |
|
241 | # the first patch in the queue is never a merge patch | |
242 | # |
|
242 | # | |
243 | pname = ".hg.patches.merge.marker" |
|
243 | pname = ".hg.patches.merge.marker" | |
244 | n = repo.commit(None, '[mq]: merge marker', user=None, force=1, |
|
244 | n = repo.commit(None, '[mq]: merge marker', user=None, force=1, | |
245 | wlock=wlock) |
|
245 | wlock=wlock) | |
246 | self.applied.append(StatusEntry(revlog.hex(n), pname)) |
|
246 | self.applied.append(StatusEntry(revlog.hex(n), pname)) | |
247 | self.applied_dirty = 1 |
|
247 | self.applied_dirty = 1 | |
248 |
|
248 | |||
249 | head = self.qparents(repo) |
|
249 | head = self.qparents(repo) | |
250 |
|
250 | |||
251 | for patch in series: |
|
251 | for patch in series: | |
252 | patch = mergeq.lookup(patch, strict=True) |
|
252 | patch = mergeq.lookup(patch, strict=True) | |
253 | if not patch: |
|
253 | if not patch: | |
254 | self.ui.warn("patch %s does not exist\n" % patch) |
|
254 | self.ui.warn("patch %s does not exist\n" % patch) | |
255 | return (1, None) |
|
255 | return (1, None) | |
256 |
|
256 | |||
257 | info = mergeq.isapplied(patch) |
|
257 | info = mergeq.isapplied(patch) | |
258 | if not info: |
|
258 | if not info: | |
259 | self.ui.warn("patch %s is not applied\n" % patch) |
|
259 | self.ui.warn("patch %s is not applied\n" % patch) | |
260 | return (1, None) |
|
260 | return (1, None) | |
261 | rev = revlog.bin(info[1]) |
|
261 | rev = revlog.bin(info[1]) | |
262 | (err, head) = self.mergeone(repo, mergeq, head, patch, rev, wlock) |
|
262 | (err, head) = self.mergeone(repo, mergeq, head, patch, rev, wlock) | |
263 | if head: |
|
263 | if head: | |
264 | self.applied.append(StatusEntry(revlog.hex(head), patch)) |
|
264 | self.applied.append(StatusEntry(revlog.hex(head), patch)) | |
265 | self.applied_dirty = 1 |
|
265 | self.applied_dirty = 1 | |
266 | if err: |
|
266 | if err: | |
267 | return (err, head) |
|
267 | return (err, head) | |
268 | return (0, head) |
|
268 | return (0, head) | |
269 |
|
269 | |||
270 | def patch(self, repo, patchfile): |
|
270 | def patch(self, repo, patchfile): | |
271 | '''Apply patchfile to the working directory. |
|
271 | '''Apply patchfile to the working directory. | |
272 | patchfile: file name of patch''' |
|
272 | patchfile: file name of patch''' | |
273 | try: |
|
273 | try: | |
274 | pp = util.find_in_path('gpatch', os.environ.get('PATH', ''), 'patch') |
|
274 | pp = util.find_in_path('gpatch', os.environ.get('PATH', ''), 'patch') | |
275 | f = os.popen("%s -d %s -p1 --no-backup-if-mismatch < %s" % |
|
275 | f = os.popen("%s -d %s -p1 --no-backup-if-mismatch < %s" % | |
276 | (pp, util.shellquote(repo.root), util.shellquote(patchfile))) |
|
276 | (pp, util.shellquote(repo.root), util.shellquote(patchfile))) | |
277 | except: |
|
277 | except: | |
278 | self.ui.warn("patch failed, unable to continue (try -v)\n") |
|
278 | self.ui.warn("patch failed, unable to continue (try -v)\n") | |
279 | return (None, [], False) |
|
279 | return (None, [], False) | |
280 | files = [] |
|
280 | files = [] | |
281 | fuzz = False |
|
281 | fuzz = False | |
282 | for l in f: |
|
282 | for l in f: | |
283 | l = l.rstrip('\r\n'); |
|
283 | l = l.rstrip('\r\n'); | |
284 | if self.ui.verbose: |
|
284 | if self.ui.verbose: | |
285 | self.ui.warn(l + "\n") |
|
285 | self.ui.warn(l + "\n") | |
286 | if l[:14] == 'patching file ': |
|
286 | if l[:14] == 'patching file ': | |
287 | pf = os.path.normpath(util.parse_patch_output(l)) |
|
287 | pf = os.path.normpath(util.parse_patch_output(l)) | |
288 | if pf not in files: |
|
288 | if pf not in files: | |
289 | files.append(pf) |
|
289 | files.append(pf) | |
290 | printed_file = False |
|
290 | printed_file = False | |
291 | file_str = l |
|
291 | file_str = l | |
292 | elif l.find('with fuzz') >= 0: |
|
292 | elif l.find('with fuzz') >= 0: | |
293 | if not printed_file: |
|
293 | if not printed_file: | |
294 | self.ui.warn(file_str + '\n') |
|
294 | self.ui.warn(file_str + '\n') | |
295 | printed_file = True |
|
295 | printed_file = True | |
296 | self.ui.warn(l + '\n') |
|
296 | self.ui.warn(l + '\n') | |
297 | fuzz = True |
|
297 | fuzz = True | |
298 | elif l.find('saving rejects to file') >= 0: |
|
298 | elif l.find('saving rejects to file') >= 0: | |
299 | self.ui.warn(l + '\n') |
|
299 | self.ui.warn(l + '\n') | |
300 | elif l.find('FAILED') >= 0: |
|
300 | elif l.find('FAILED') >= 0: | |
301 | if not printed_file: |
|
301 | if not printed_file: | |
302 | self.ui.warn(file_str + '\n') |
|
302 | self.ui.warn(file_str + '\n') | |
303 | printed_file = True |
|
303 | printed_file = True | |
304 | self.ui.warn(l + '\n') |
|
304 | self.ui.warn(l + '\n') | |
305 |
|
305 | |||
306 | return (not f.close(), files, fuzz) |
|
306 | return (not f.close(), files, fuzz) | |
307 |
|
307 | |||
308 | def apply(self, repo, series, list=False, update_status=True, |
|
308 | def apply(self, repo, series, list=False, update_status=True, | |
309 | strict=False, patchdir=None, merge=None, wlock=None): |
|
309 | strict=False, patchdir=None, merge=None, wlock=None): | |
310 | # TODO unify with commands.py |
|
310 | # TODO unify with commands.py | |
311 | if not patchdir: |
|
311 | if not patchdir: | |
312 | patchdir = self.path |
|
312 | patchdir = self.path | |
313 | err = 0 |
|
313 | err = 0 | |
314 | if not wlock: |
|
314 | if not wlock: | |
315 | wlock = repo.wlock() |
|
315 | wlock = repo.wlock() | |
316 | lock = repo.lock() |
|
316 | lock = repo.lock() | |
317 | tr = repo.transaction() |
|
317 | tr = repo.transaction() | |
318 | n = None |
|
318 | n = None | |
319 | for patch in series: |
|
319 | for patch in series: | |
320 | self.ui.warn("applying %s\n" % patch) |
|
320 | self.ui.warn("applying %s\n" % patch) | |
321 | pf = os.path.join(patchdir, patch) |
|
321 | pf = os.path.join(patchdir, patch) | |
322 |
|
322 | |||
323 | try: |
|
323 | try: | |
324 | message, comments, user, date, patchfound = self.readheaders(patch) |
|
324 | message, comments, user, date, patchfound = self.readheaders(patch) | |
325 | except: |
|
325 | except: | |
326 | self.ui.warn("Unable to read %s\n" % pf) |
|
326 | self.ui.warn("Unable to read %s\n" % pf) | |
327 | err = 1 |
|
327 | err = 1 | |
328 | break |
|
328 | break | |
329 |
|
329 | |||
330 | if not message: |
|
330 | if not message: | |
331 | message = "imported patch %s\n" % patch |
|
331 | message = "imported patch %s\n" % patch | |
332 | else: |
|
332 | else: | |
333 | if list: |
|
333 | if list: | |
334 | message.append("\nimported patch %s" % patch) |
|
334 | message.append("\nimported patch %s" % patch) | |
335 | message = '\n'.join(message) |
|
335 | message = '\n'.join(message) | |
336 |
|
336 | |||
337 | (patcherr, files, fuzz) = self.patch(repo, pf) |
|
337 | (patcherr, files, fuzz) = self.patch(repo, pf) | |
338 | patcherr = not patcherr |
|
338 | patcherr = not patcherr | |
339 |
|
339 | |||
340 | if merge and len(files) > 0: |
|
340 | if merge and len(files) > 0: | |
341 | # Mark as merged and update dirstate parent info |
|
341 | # Mark as merged and update dirstate parent info | |
342 | repo.dirstate.update(repo.dirstate.filterfiles(files), 'm') |
|
342 | repo.dirstate.update(repo.dirstate.filterfiles(files), 'm') | |
343 | p1, p2 = repo.dirstate.parents() |
|
343 | p1, p2 = repo.dirstate.parents() | |
344 | repo.dirstate.setparents(p1, merge) |
|
344 | repo.dirstate.setparents(p1, merge) | |
345 | if len(files) > 0: |
|
345 | if len(files) > 0: | |
346 | cwd = repo.getcwd() |
|
346 | cwd = repo.getcwd() | |
347 | cfiles = files |
|
347 | cfiles = files | |
348 | if cwd: |
|
348 | if cwd: | |
349 | cfiles = [util.pathto(cwd, f) for f in files] |
|
349 | cfiles = [util.pathto(cwd, f) for f in files] | |
350 | commands.addremove_lock(self.ui, repo, cfiles, |
|
350 | commands.addremove_lock(self.ui, repo, cfiles, | |
351 | opts={}, wlock=wlock) |
|
351 | opts={}, wlock=wlock) | |
352 | n = repo.commit(files, message, user, date, force=1, lock=lock, |
|
352 | n = repo.commit(files, message, user, date, force=1, lock=lock, | |
353 | wlock=wlock) |
|
353 | wlock=wlock) | |
354 |
|
354 | |||
355 | if n == None: |
|
355 | if n == None: | |
356 | raise util.Abort(_("repo commit failed")) |
|
356 | raise util.Abort(_("repo commit failed")) | |
357 |
|
357 | |||
358 | if update_status: |
|
358 | if update_status: | |
359 | self.applied.append(StatusEntry(revlog.hex(n), patch)) |
|
359 | self.applied.append(StatusEntry(revlog.hex(n), patch)) | |
360 |
|
360 | |||
361 | if patcherr: |
|
361 | if patcherr: | |
362 | if not patchfound: |
|
362 | if not patchfound: | |
363 | self.ui.warn("patch %s is empty\n" % patch) |
|
363 | self.ui.warn("patch %s is empty\n" % patch) | |
364 | err = 0 |
|
364 | err = 0 | |
365 | else: |
|
365 | else: | |
366 | self.ui.warn("patch failed, rejects left in working dir\n") |
|
366 | self.ui.warn("patch failed, rejects left in working dir\n") | |
367 | err = 1 |
|
367 | err = 1 | |
368 | break |
|
368 | break | |
369 |
|
369 | |||
370 | if fuzz and strict: |
|
370 | if fuzz and strict: | |
371 | self.ui.warn("fuzz found when applying patch, stopping\n") |
|
371 | self.ui.warn("fuzz found when applying patch, stopping\n") | |
372 | err = 1 |
|
372 | err = 1 | |
373 | break |
|
373 | break | |
374 | tr.close() |
|
374 | tr.close() | |
375 | return (err, n) |
|
375 | return (err, n) | |
376 |
|
376 | |||
377 | def delete(self, repo, patch, force=False): |
|
377 | def delete(self, repo, patch, force=False): | |
378 | patch = self.lookup(patch, strict=True) |
|
378 | patch = self.lookup(patch, strict=True) | |
379 | info = self.isapplied(patch) |
|
379 | info = self.isapplied(patch) | |
380 | if info: |
|
380 | if info: | |
381 | raise util.Abort(_("cannot delete applied patch %s") % patch) |
|
381 | raise util.Abort(_("cannot delete applied patch %s") % patch) | |
382 | if patch not in self.series: |
|
382 | if patch not in self.series: | |
383 | raise util.Abort(_("patch %s not in series file") % patch) |
|
383 | raise util.Abort(_("patch %s not in series file") % patch) | |
384 | if force: |
|
384 | if force: | |
385 | r = self.qrepo() |
|
385 | r = self.qrepo() | |
386 | if r: |
|
386 | if r: | |
387 | r.remove([patch], True) |
|
387 | r.remove([patch], True) | |
388 | else: |
|
388 | else: | |
389 | os.unlink(os.path.join(self.path, patch)) |
|
389 | os.unlink(os.path.join(self.path, patch)) | |
390 | i = self.find_series(patch) |
|
390 | i = self.find_series(patch) | |
391 | del self.full_series[i] |
|
391 | del self.full_series[i] | |
392 | self.parse_series() |
|
392 | self.parse_series() | |
393 | self.series_dirty = 1 |
|
393 | self.series_dirty = 1 | |
394 |
|
394 | |||
395 | def check_toppatch(self, repo): |
|
395 | def check_toppatch(self, repo): | |
396 | if len(self.applied) > 0: |
|
396 | if len(self.applied) > 0: | |
397 | top = revlog.bin(self.applied[-1].rev) |
|
397 | top = revlog.bin(self.applied[-1].rev) | |
398 | pp = repo.dirstate.parents() |
|
398 | pp = repo.dirstate.parents() | |
399 | if top not in pp: |
|
399 | if top not in pp: | |
400 | raise util.Abort(_("queue top not at same revision as working directory")) |
|
400 | raise util.Abort(_("queue top not at same revision as working directory")) | |
401 | return top |
|
401 | return top | |
402 | return None |
|
402 | return None | |
403 | def check_localchanges(self, repo): |
|
403 | def check_localchanges(self, repo): | |
404 | (c, a, r, d, u) = repo.changes(None, None) |
|
404 | (c, a, r, d, u) = repo.changes(None, None) | |
405 | if c or a or d or r: |
|
405 | if c or a or d or r: | |
406 | raise util.Abort(_("local changes found, refresh first")) |
|
406 | raise util.Abort(_("local changes found, refresh first")) | |
407 | def new(self, repo, patch, msg=None, force=None): |
|
407 | def new(self, repo, patch, msg=None, force=None): | |
408 | if os.path.exists(os.path.join(self.path, patch)): |
|
408 | if os.path.exists(os.path.join(self.path, patch)): | |
409 | raise util.Abort(_('patch "%s" already exists') % patch) |
|
409 | raise util.Abort(_('patch "%s" already exists') % patch) | |
410 | commitfiles = [] |
|
410 | commitfiles = [] | |
411 | (c, a, r, d, u) = repo.changes(None, None) |
|
411 | (c, a, r, d, u) = repo.changes(None, None) | |
412 | if c or a or d or r: |
|
412 | if c or a or d or r: | |
413 | if not force: |
|
413 | if not force: | |
414 | raise util.Abort(_("local changes found, refresh first")) |
|
414 | raise util.Abort(_("local changes found, refresh first")) | |
415 | commitfiles = c + a + r |
|
415 | commitfiles = c + a + r | |
416 | self.check_toppatch(repo) |
|
416 | self.check_toppatch(repo) | |
417 | wlock = repo.wlock() |
|
417 | wlock = repo.wlock() | |
418 | insert = self.full_series_end() |
|
418 | insert = self.full_series_end() | |
419 | if msg: |
|
419 | if msg: | |
420 | n = repo.commit(commitfiles, "[mq]: %s" % msg, force=True, |
|
420 | n = repo.commit(commitfiles, "[mq]: %s" % msg, force=True, | |
421 | wlock=wlock) |
|
421 | wlock=wlock) | |
422 | else: |
|
422 | else: | |
423 | n = repo.commit(commitfiles, |
|
423 | n = repo.commit(commitfiles, | |
424 | "New patch: %s" % patch, force=True, wlock=wlock) |
|
424 | "New patch: %s" % patch, force=True, wlock=wlock) | |
425 | if n == None: |
|
425 | if n == None: | |
426 | raise util.Abort(_("repo commit failed")) |
|
426 | raise util.Abort(_("repo commit failed")) | |
427 | self.full_series[insert:insert] = [patch] |
|
427 | self.full_series[insert:insert] = [patch] | |
428 | self.applied.append(StatusEntry(revlog.hex(n), patch)) |
|
428 | self.applied.append(StatusEntry(revlog.hex(n), patch)) | |
429 | self.parse_series() |
|
429 | self.parse_series() | |
430 | self.series_dirty = 1 |
|
430 | self.series_dirty = 1 | |
431 | self.applied_dirty = 1 |
|
431 | self.applied_dirty = 1 | |
432 | p = self.opener(patch, "w") |
|
432 | p = self.opener(patch, "w") | |
433 | if msg: |
|
433 | if msg: | |
434 | msg = msg + "\n" |
|
434 | msg = msg + "\n" | |
435 | p.write(msg) |
|
435 | p.write(msg) | |
436 | p.close() |
|
436 | p.close() | |
437 | wlock = None |
|
437 | wlock = None | |
438 | r = self.qrepo() |
|
438 | r = self.qrepo() | |
439 | if r: r.add([patch]) |
|
439 | if r: r.add([patch]) | |
440 | if commitfiles: |
|
440 | if commitfiles: | |
441 | self.refresh(repo, msg=None, short=True) |
|
441 | self.refresh(repo, msg=None, short=True) | |
442 |
|
442 | |||
443 | def strip(self, repo, rev, update=True, backup="all", wlock=None): |
|
443 | def strip(self, repo, rev, update=True, backup="all", wlock=None): | |
444 | def limitheads(chlog, stop): |
|
444 | def limitheads(chlog, stop): | |
445 | """return the list of all nodes that have no children""" |
|
445 | """return the list of all nodes that have no children""" | |
446 | p = {} |
|
446 | p = {} | |
447 | h = [] |
|
447 | h = [] | |
448 | stoprev = 0 |
|
448 | stoprev = 0 | |
449 | if stop in chlog.nodemap: |
|
449 | if stop in chlog.nodemap: | |
450 | stoprev = chlog.rev(stop) |
|
450 | stoprev = chlog.rev(stop) | |
451 |
|
451 | |||
452 | for r in range(chlog.count() - 1, -1, -1): |
|
452 | for r in range(chlog.count() - 1, -1, -1): | |
453 | n = chlog.node(r) |
|
453 | n = chlog.node(r) | |
454 | if n not in p: |
|
454 | if n not in p: | |
455 | h.append(n) |
|
455 | h.append(n) | |
456 | if n == stop: |
|
456 | if n == stop: | |
457 | break |
|
457 | break | |
458 | if r < stoprev: |
|
458 | if r < stoprev: | |
459 | break |
|
459 | break | |
460 | for pn in chlog.parents(n): |
|
460 | for pn in chlog.parents(n): | |
461 | p[pn] = 1 |
|
461 | p[pn] = 1 | |
462 | return h |
|
462 | return h | |
463 |
|
463 | |||
464 | def bundle(cg): |
|
464 | def bundle(cg): | |
465 | backupdir = repo.join("strip-backup") |
|
465 | backupdir = repo.join("strip-backup") | |
466 | if not os.path.isdir(backupdir): |
|
466 | if not os.path.isdir(backupdir): | |
467 | os.mkdir(backupdir) |
|
467 | os.mkdir(backupdir) | |
468 | name = os.path.join(backupdir, "%s" % revlog.short(rev)) |
|
468 | name = os.path.join(backupdir, "%s" % revlog.short(rev)) | |
469 | name = savename(name) |
|
469 | name = savename(name) | |
470 | self.ui.warn("saving bundle to %s\n" % name) |
|
470 | self.ui.warn("saving bundle to %s\n" % name) | |
471 | # TODO, exclusive open |
|
471 | # TODO, exclusive open | |
472 | f = open(name, "wb") |
|
472 | f = open(name, "wb") | |
473 | try: |
|
473 | try: | |
474 | f.write("HG10") |
|
474 | f.write("HG10") | |
475 | z = bz2.BZ2Compressor(9) |
|
475 | z = bz2.BZ2Compressor(9) | |
476 | while 1: |
|
476 | while 1: | |
477 | chunk = cg.read(4096) |
|
477 | chunk = cg.read(4096) | |
478 | if not chunk: |
|
478 | if not chunk: | |
479 | break |
|
479 | break | |
480 | f.write(z.compress(chunk)) |
|
480 | f.write(z.compress(chunk)) | |
481 | f.write(z.flush()) |
|
481 | f.write(z.flush()) | |
482 | except: |
|
482 | except: | |
483 | os.unlink(name) |
|
483 | os.unlink(name) | |
484 | raise |
|
484 | raise | |
485 | f.close() |
|
485 | f.close() | |
486 | return name |
|
486 | return name | |
487 |
|
487 | |||
488 | def stripall(rev, revnum): |
|
488 | def stripall(rev, revnum): | |
489 | cl = repo.changelog |
|
489 | cl = repo.changelog | |
490 | c = cl.read(rev) |
|
490 | c = cl.read(rev) | |
491 | mm = repo.manifest.read(c[0]) |
|
491 | mm = repo.manifest.read(c[0]) | |
492 | seen = {} |
|
492 | seen = {} | |
493 |
|
493 | |||
494 | for x in xrange(revnum, cl.count()): |
|
494 | for x in xrange(revnum, cl.count()): | |
495 | c = cl.read(cl.node(x)) |
|
495 | c = cl.read(cl.node(x)) | |
496 | for f in c[3]: |
|
496 | for f in c[3]: | |
497 | if f in seen: |
|
497 | if f in seen: | |
498 | continue |
|
498 | continue | |
499 | seen[f] = 1 |
|
499 | seen[f] = 1 | |
500 | if f in mm: |
|
500 | if f in mm: | |
501 | filerev = mm[f] |
|
501 | filerev = mm[f] | |
502 | else: |
|
502 | else: | |
503 | filerev = 0 |
|
503 | filerev = 0 | |
504 | seen[f] = filerev |
|
504 | seen[f] = filerev | |
505 | # we go in two steps here so the strip loop happens in a |
|
505 | # we go in two steps here so the strip loop happens in a | |
506 | # sensible order. When stripping many files, this helps keep |
|
506 | # sensible order. When stripping many files, this helps keep | |
507 | # our disk access patterns under control. |
|
507 | # our disk access patterns under control. | |
508 | seen_list = seen.keys() |
|
508 | seen_list = seen.keys() | |
509 | seen_list.sort() |
|
509 | seen_list.sort() | |
510 | for f in seen_list: |
|
510 | for f in seen_list: | |
511 | ff = repo.file(f) |
|
511 | ff = repo.file(f) | |
512 | filerev = seen[f] |
|
512 | filerev = seen[f] | |
513 | if filerev != 0: |
|
513 | if filerev != 0: | |
514 | if filerev in ff.nodemap: |
|
514 | if filerev in ff.nodemap: | |
515 | filerev = ff.rev(filerev) |
|
515 | filerev = ff.rev(filerev) | |
516 | else: |
|
516 | else: | |
517 | filerev = 0 |
|
517 | filerev = 0 | |
518 | ff.strip(filerev, revnum) |
|
518 | ff.strip(filerev, revnum) | |
519 |
|
519 | |||
520 | if not wlock: |
|
520 | if not wlock: | |
521 | wlock = repo.wlock() |
|
521 | wlock = repo.wlock() | |
522 | lock = repo.lock() |
|
522 | lock = repo.lock() | |
523 | chlog = repo.changelog |
|
523 | chlog = repo.changelog | |
524 | # TODO delete the undo files, and handle undo of merge sets |
|
524 | # TODO delete the undo files, and handle undo of merge sets | |
525 | pp = chlog.parents(rev) |
|
525 | pp = chlog.parents(rev) | |
526 | revnum = chlog.rev(rev) |
|
526 | revnum = chlog.rev(rev) | |
527 |
|
527 | |||
528 | if update: |
|
528 | if update: | |
529 | (c, a, r, d, u) = repo.changes(None, None) |
|
529 | (c, a, r, d, u) = repo.changes(None, None) | |
530 | if c or a or d or r: |
|
530 | if c or a or d or r: | |
531 | raise util.Abort(_("local changes found")) |
|
531 | raise util.Abort(_("local changes found")) | |
532 | urev = self.qparents(repo, rev) |
|
532 | urev = self.qparents(repo, rev) | |
533 |
hg. |
|
533 | hg.clean(repo, urev, wlock=wlock) | |
534 | repo.dirstate.write() |
|
534 | repo.dirstate.write() | |
535 |
|
535 | |||
536 | # save is a list of all the branches we are truncating away |
|
536 | # save is a list of all the branches we are truncating away | |
537 | # that we actually want to keep. changegroup will be used |
|
537 | # that we actually want to keep. changegroup will be used | |
538 | # to preserve them and add them back after the truncate |
|
538 | # to preserve them and add them back after the truncate | |
539 | saveheads = [] |
|
539 | saveheads = [] | |
540 | savebases = {} |
|
540 | savebases = {} | |
541 |
|
541 | |||
542 | heads = limitheads(chlog, rev) |
|
542 | heads = limitheads(chlog, rev) | |
543 | seen = {} |
|
543 | seen = {} | |
544 |
|
544 | |||
545 | # search through all the heads, finding those where the revision |
|
545 | # search through all the heads, finding those where the revision | |
546 | # we want to strip away is an ancestor. Also look for merges |
|
546 | # we want to strip away is an ancestor. Also look for merges | |
547 | # that might be turned into new heads by the strip. |
|
547 | # that might be turned into new heads by the strip. | |
548 | while heads: |
|
548 | while heads: | |
549 | h = heads.pop() |
|
549 | h = heads.pop() | |
550 | n = h |
|
550 | n = h | |
551 | while True: |
|
551 | while True: | |
552 | seen[n] = 1 |
|
552 | seen[n] = 1 | |
553 | pp = chlog.parents(n) |
|
553 | pp = chlog.parents(n) | |
554 | if pp[1] != revlog.nullid and chlog.rev(pp[1]) > revnum: |
|
554 | if pp[1] != revlog.nullid and chlog.rev(pp[1]) > revnum: | |
555 | if pp[1] not in seen: |
|
555 | if pp[1] not in seen: | |
556 | heads.append(pp[1]) |
|
556 | heads.append(pp[1]) | |
557 | if pp[0] == revlog.nullid: |
|
557 | if pp[0] == revlog.nullid: | |
558 | break |
|
558 | break | |
559 | if chlog.rev(pp[0]) < revnum: |
|
559 | if chlog.rev(pp[0]) < revnum: | |
560 | break |
|
560 | break | |
561 | n = pp[0] |
|
561 | n = pp[0] | |
562 | if n == rev: |
|
562 | if n == rev: | |
563 | break |
|
563 | break | |
564 | r = chlog.reachable(h, rev) |
|
564 | r = chlog.reachable(h, rev) | |
565 | if rev not in r: |
|
565 | if rev not in r: | |
566 | saveheads.append(h) |
|
566 | saveheads.append(h) | |
567 | for x in r: |
|
567 | for x in r: | |
568 | if chlog.rev(x) > revnum: |
|
568 | if chlog.rev(x) > revnum: | |
569 | savebases[x] = 1 |
|
569 | savebases[x] = 1 | |
570 |
|
570 | |||
571 | # create a changegroup for all the branches we need to keep |
|
571 | # create a changegroup for all the branches we need to keep | |
572 | if backup == "all": |
|
572 | if backup == "all": | |
573 | backupch = repo.changegroupsubset([rev], chlog.heads(), 'strip') |
|
573 | backupch = repo.changegroupsubset([rev], chlog.heads(), 'strip') | |
574 | bundle(backupch) |
|
574 | bundle(backupch) | |
575 | if saveheads: |
|
575 | if saveheads: | |
576 | backupch = repo.changegroupsubset(savebases.keys(), saveheads, 'strip') |
|
576 | backupch = repo.changegroupsubset(savebases.keys(), saveheads, 'strip') | |
577 | chgrpfile = bundle(backupch) |
|
577 | chgrpfile = bundle(backupch) | |
578 |
|
578 | |||
579 | stripall(rev, revnum) |
|
579 | stripall(rev, revnum) | |
580 |
|
580 | |||
581 | change = chlog.read(rev) |
|
581 | change = chlog.read(rev) | |
582 | repo.manifest.strip(repo.manifest.rev(change[0]), revnum) |
|
582 | repo.manifest.strip(repo.manifest.rev(change[0]), revnum) | |
583 | chlog.strip(revnum, revnum) |
|
583 | chlog.strip(revnum, revnum) | |
584 | if saveheads: |
|
584 | if saveheads: | |
585 | self.ui.status("adding branch\n") |
|
585 | self.ui.status("adding branch\n") | |
586 | commands.unbundle(self.ui, repo, chgrpfile, update=False) |
|
586 | commands.unbundle(self.ui, repo, chgrpfile, update=False) | |
587 | if backup != "strip": |
|
587 | if backup != "strip": | |
588 | os.unlink(chgrpfile) |
|
588 | os.unlink(chgrpfile) | |
589 |
|
589 | |||
590 | def isapplied(self, patch): |
|
590 | def isapplied(self, patch): | |
591 | """returns (index, rev, patch)""" |
|
591 | """returns (index, rev, patch)""" | |
592 | for i in xrange(len(self.applied)): |
|
592 | for i in xrange(len(self.applied)): | |
593 | a = self.applied[i] |
|
593 | a = self.applied[i] | |
594 | if a.name == patch: |
|
594 | if a.name == patch: | |
595 | return (i, a.rev, a.name) |
|
595 | return (i, a.rev, a.name) | |
596 | return None |
|
596 | return None | |
597 |
|
597 | |||
598 | # if the exact patch name does not exist, we try a few |
|
598 | # if the exact patch name does not exist, we try a few | |
599 | # variations. If strict is passed, we try only #1 |
|
599 | # variations. If strict is passed, we try only #1 | |
600 | # |
|
600 | # | |
601 | # 1) a number to indicate an offset in the series file |
|
601 | # 1) a number to indicate an offset in the series file | |
602 | # 2) a unique substring of the patch name was given |
|
602 | # 2) a unique substring of the patch name was given | |
603 | # 3) patchname[-+]num to indicate an offset in the series file |
|
603 | # 3) patchname[-+]num to indicate an offset in the series file | |
604 | def lookup(self, patch, strict=False): |
|
604 | def lookup(self, patch, strict=False): | |
605 | def partial_name(s): |
|
605 | def partial_name(s): | |
606 | if s in self.series: |
|
606 | if s in self.series: | |
607 | return s |
|
607 | return s | |
608 | matches = [x for x in self.series if s in x] |
|
608 | matches = [x for x in self.series if s in x] | |
609 | if len(matches) > 1: |
|
609 | if len(matches) > 1: | |
610 | self.ui.warn(_('patch name "%s" is ambiguous:\n') % s) |
|
610 | self.ui.warn(_('patch name "%s" is ambiguous:\n') % s) | |
611 | for m in matches: |
|
611 | for m in matches: | |
612 | self.ui.warn(' %s\n' % m) |
|
612 | self.ui.warn(' %s\n' % m) | |
613 | return None |
|
613 | return None | |
614 | if matches: |
|
614 | if matches: | |
615 | return matches[0] |
|
615 | return matches[0] | |
616 | if len(self.series) > 0 and len(self.applied) > 0: |
|
616 | if len(self.series) > 0 and len(self.applied) > 0: | |
617 | if s == 'qtip': |
|
617 | if s == 'qtip': | |
618 | return self.series[self.series_end()-1] |
|
618 | return self.series[self.series_end()-1] | |
619 | if s == 'qbase': |
|
619 | if s == 'qbase': | |
620 | return self.series[0] |
|
620 | return self.series[0] | |
621 | return None |
|
621 | return None | |
622 | if patch == None: |
|
622 | if patch == None: | |
623 | return None |
|
623 | return None | |
624 |
|
624 | |||
625 | # we don't want to return a partial match until we make |
|
625 | # we don't want to return a partial match until we make | |
626 | # sure the file name passed in does not exist (checked below) |
|
626 | # sure the file name passed in does not exist (checked below) | |
627 | res = partial_name(patch) |
|
627 | res = partial_name(patch) | |
628 | if res and res == patch: |
|
628 | if res and res == patch: | |
629 | return res |
|
629 | return res | |
630 |
|
630 | |||
631 | if not os.path.isfile(os.path.join(self.path, patch)): |
|
631 | if not os.path.isfile(os.path.join(self.path, patch)): | |
632 | try: |
|
632 | try: | |
633 | sno = int(patch) |
|
633 | sno = int(patch) | |
634 | except(ValueError, OverflowError): |
|
634 | except(ValueError, OverflowError): | |
635 | pass |
|
635 | pass | |
636 | else: |
|
636 | else: | |
637 | if sno < len(self.series): |
|
637 | if sno < len(self.series): | |
638 | patch = self.series[sno] |
|
638 | patch = self.series[sno] | |
639 | return patch |
|
639 | return patch | |
640 | if not strict: |
|
640 | if not strict: | |
641 | # return any partial match made above |
|
641 | # return any partial match made above | |
642 | if res: |
|
642 | if res: | |
643 | return res |
|
643 | return res | |
644 | minus = patch.rsplit('-', 1) |
|
644 | minus = patch.rsplit('-', 1) | |
645 | if len(minus) > 1: |
|
645 | if len(minus) > 1: | |
646 | res = partial_name(minus[0]) |
|
646 | res = partial_name(minus[0]) | |
647 | if res: |
|
647 | if res: | |
648 | i = self.series.index(res) |
|
648 | i = self.series.index(res) | |
649 | try: |
|
649 | try: | |
650 | off = int(minus[1] or 1) |
|
650 | off = int(minus[1] or 1) | |
651 | except(ValueError, OverflowError): |
|
651 | except(ValueError, OverflowError): | |
652 | pass |
|
652 | pass | |
653 | else: |
|
653 | else: | |
654 | if i - off >= 0: |
|
654 | if i - off >= 0: | |
655 | return self.series[i - off] |
|
655 | return self.series[i - off] | |
656 | plus = patch.rsplit('+', 1) |
|
656 | plus = patch.rsplit('+', 1) | |
657 | if len(plus) > 1: |
|
657 | if len(plus) > 1: | |
658 | res = partial_name(plus[0]) |
|
658 | res = partial_name(plus[0]) | |
659 | if res: |
|
659 | if res: | |
660 | i = self.series.index(res) |
|
660 | i = self.series.index(res) | |
661 | try: |
|
661 | try: | |
662 | off = int(plus[1] or 1) |
|
662 | off = int(plus[1] or 1) | |
663 | except(ValueError, OverflowError): |
|
663 | except(ValueError, OverflowError): | |
664 | pass |
|
664 | pass | |
665 | else: |
|
665 | else: | |
666 | if i + off < len(self.series): |
|
666 | if i + off < len(self.series): | |
667 | return self.series[i + off] |
|
667 | return self.series[i + off] | |
668 | raise util.Abort(_("patch %s not in series") % patch) |
|
668 | raise util.Abort(_("patch %s not in series") % patch) | |
669 |
|
669 | |||
670 | def push(self, repo, patch=None, force=False, list=False, |
|
670 | def push(self, repo, patch=None, force=False, list=False, | |
671 | mergeq=None, wlock=None): |
|
671 | mergeq=None, wlock=None): | |
672 | if not wlock: |
|
672 | if not wlock: | |
673 | wlock = repo.wlock() |
|
673 | wlock = repo.wlock() | |
674 | patch = self.lookup(patch) |
|
674 | patch = self.lookup(patch) | |
675 | if patch and self.isapplied(patch): |
|
675 | if patch and self.isapplied(patch): | |
676 | self.ui.warn(_("patch %s is already applied\n") % patch) |
|
676 | self.ui.warn(_("patch %s is already applied\n") % patch) | |
677 | sys.exit(1) |
|
677 | sys.exit(1) | |
678 | if self.series_end() == len(self.series): |
|
678 | if self.series_end() == len(self.series): | |
679 | self.ui.warn(_("patch series fully applied\n")) |
|
679 | self.ui.warn(_("patch series fully applied\n")) | |
680 | sys.exit(1) |
|
680 | sys.exit(1) | |
681 | if not force: |
|
681 | if not force: | |
682 | self.check_localchanges(repo) |
|
682 | self.check_localchanges(repo) | |
683 |
|
683 | |||
684 | self.applied_dirty = 1; |
|
684 | self.applied_dirty = 1; | |
685 | start = self.series_end() |
|
685 | start = self.series_end() | |
686 | if start > 0: |
|
686 | if start > 0: | |
687 | self.check_toppatch(repo) |
|
687 | self.check_toppatch(repo) | |
688 | if not patch: |
|
688 | if not patch: | |
689 | patch = self.series[start] |
|
689 | patch = self.series[start] | |
690 | end = start + 1 |
|
690 | end = start + 1 | |
691 | else: |
|
691 | else: | |
692 | end = self.series.index(patch, start) + 1 |
|
692 | end = self.series.index(patch, start) + 1 | |
693 | s = self.series[start:end] |
|
693 | s = self.series[start:end] | |
694 | if mergeq: |
|
694 | if mergeq: | |
695 | ret = self.mergepatch(repo, mergeq, s, wlock) |
|
695 | ret = self.mergepatch(repo, mergeq, s, wlock) | |
696 | else: |
|
696 | else: | |
697 | ret = self.apply(repo, s, list, wlock=wlock) |
|
697 | ret = self.apply(repo, s, list, wlock=wlock) | |
698 | top = self.applied[-1].name |
|
698 | top = self.applied[-1].name | |
699 | if ret[0]: |
|
699 | if ret[0]: | |
700 | self.ui.write("Errors during apply, please fix and refresh %s\n" % |
|
700 | self.ui.write("Errors during apply, please fix and refresh %s\n" % | |
701 | top) |
|
701 | top) | |
702 | else: |
|
702 | else: | |
703 | self.ui.write("Now at: %s\n" % top) |
|
703 | self.ui.write("Now at: %s\n" % top) | |
704 | return ret[0] |
|
704 | return ret[0] | |
705 |
|
705 | |||
706 | def pop(self, repo, patch=None, force=False, update=True, all=False, |
|
706 | def pop(self, repo, patch=None, force=False, update=True, all=False, | |
707 | wlock=None): |
|
707 | wlock=None): | |
708 | def getfile(f, rev): |
|
708 | def getfile(f, rev): | |
709 | t = repo.file(f).read(rev) |
|
709 | t = repo.file(f).read(rev) | |
710 | try: |
|
710 | try: | |
711 | repo.wfile(f, "w").write(t) |
|
711 | repo.wfile(f, "w").write(t) | |
712 | except IOError: |
|
712 | except IOError: | |
713 | try: |
|
713 | try: | |
714 | os.makedirs(os.path.dirname(repo.wjoin(f))) |
|
714 | os.makedirs(os.path.dirname(repo.wjoin(f))) | |
715 | except OSError, err: |
|
715 | except OSError, err: | |
716 | if err.errno != errno.EEXIST: raise |
|
716 | if err.errno != errno.EEXIST: raise | |
717 | repo.wfile(f, "w").write(t) |
|
717 | repo.wfile(f, "w").write(t) | |
718 |
|
718 | |||
719 | if not wlock: |
|
719 | if not wlock: | |
720 | wlock = repo.wlock() |
|
720 | wlock = repo.wlock() | |
721 | if patch: |
|
721 | if patch: | |
722 | # index, rev, patch |
|
722 | # index, rev, patch | |
723 | info = self.isapplied(patch) |
|
723 | info = self.isapplied(patch) | |
724 | if not info: |
|
724 | if not info: | |
725 | patch = self.lookup(patch) |
|
725 | patch = self.lookup(patch) | |
726 | info = self.isapplied(patch) |
|
726 | info = self.isapplied(patch) | |
727 | if not info: |
|
727 | if not info: | |
728 | raise util.Abort(_("patch %s is not applied") % patch) |
|
728 | raise util.Abort(_("patch %s is not applied") % patch) | |
729 | if len(self.applied) == 0: |
|
729 | if len(self.applied) == 0: | |
730 | self.ui.warn(_("no patches applied\n")) |
|
730 | self.ui.warn(_("no patches applied\n")) | |
731 | sys.exit(1) |
|
731 | sys.exit(1) | |
732 |
|
732 | |||
733 | if not update: |
|
733 | if not update: | |
734 | parents = repo.dirstate.parents() |
|
734 | parents = repo.dirstate.parents() | |
735 | rr = [ revlog.bin(x.rev) for x in self.applied ] |
|
735 | rr = [ revlog.bin(x.rev) for x in self.applied ] | |
736 | for p in parents: |
|
736 | for p in parents: | |
737 | if p in rr: |
|
737 | if p in rr: | |
738 | self.ui.warn("qpop: forcing dirstate update\n") |
|
738 | self.ui.warn("qpop: forcing dirstate update\n") | |
739 | update = True |
|
739 | update = True | |
740 |
|
740 | |||
741 | if not force and update: |
|
741 | if not force and update: | |
742 | self.check_localchanges(repo) |
|
742 | self.check_localchanges(repo) | |
743 |
|
743 | |||
744 | self.applied_dirty = 1; |
|
744 | self.applied_dirty = 1; | |
745 | end = len(self.applied) |
|
745 | end = len(self.applied) | |
746 | if not patch: |
|
746 | if not patch: | |
747 | if all: |
|
747 | if all: | |
748 | popi = 0 |
|
748 | popi = 0 | |
749 | else: |
|
749 | else: | |
750 | popi = len(self.applied) - 1 |
|
750 | popi = len(self.applied) - 1 | |
751 | else: |
|
751 | else: | |
752 | popi = info[0] + 1 |
|
752 | popi = info[0] + 1 | |
753 | if popi >= end: |
|
753 | if popi >= end: | |
754 | self.ui.warn("qpop: %s is already at the top\n" % patch) |
|
754 | self.ui.warn("qpop: %s is already at the top\n" % patch) | |
755 | return |
|
755 | return | |
756 | info = [ popi ] + [self.applied[popi].rev, self.applied[popi].name] |
|
756 | info = [ popi ] + [self.applied[popi].rev, self.applied[popi].name] | |
757 |
|
757 | |||
758 | start = info[0] |
|
758 | start = info[0] | |
759 | rev = revlog.bin(info[1]) |
|
759 | rev = revlog.bin(info[1]) | |
760 |
|
760 | |||
761 | # we know there are no local changes, so we can make a simplified |
|
761 | # we know there are no local changes, so we can make a simplified | |
762 | # form of hg.update. |
|
762 | # form of hg.update. | |
763 | if update: |
|
763 | if update: | |
764 | top = self.check_toppatch(repo) |
|
764 | top = self.check_toppatch(repo) | |
765 | qp = self.qparents(repo, rev) |
|
765 | qp = self.qparents(repo, rev) | |
766 | changes = repo.changelog.read(qp) |
|
766 | changes = repo.changelog.read(qp) | |
767 | mf1 = repo.manifest.readflags(changes[0]) |
|
767 | mf1 = repo.manifest.readflags(changes[0]) | |
768 | mmap = repo.manifest.read(changes[0]) |
|
768 | mmap = repo.manifest.read(changes[0]) | |
769 | (c, a, r, d, u) = repo.changes(qp, top) |
|
769 | (c, a, r, d, u) = repo.changes(qp, top) | |
770 | if d: |
|
770 | if d: | |
771 | raise util.Abort("deletions found between repo revs") |
|
771 | raise util.Abort("deletions found between repo revs") | |
772 | for f in c: |
|
772 | for f in c: | |
773 | getfile(f, mmap[f]) |
|
773 | getfile(f, mmap[f]) | |
774 | for f in r: |
|
774 | for f in r: | |
775 | getfile(f, mmap[f]) |
|
775 | getfile(f, mmap[f]) | |
776 | util.set_exec(repo.wjoin(f), mf1[f]) |
|
776 | util.set_exec(repo.wjoin(f), mf1[f]) | |
777 | repo.dirstate.update(c + r, 'n') |
|
777 | repo.dirstate.update(c + r, 'n') | |
778 | for f in a: |
|
778 | for f in a: | |
779 | try: os.unlink(repo.wjoin(f)) |
|
779 | try: os.unlink(repo.wjoin(f)) | |
780 | except: raise |
|
780 | except: raise | |
781 | try: os.removedirs(os.path.dirname(repo.wjoin(f))) |
|
781 | try: os.removedirs(os.path.dirname(repo.wjoin(f))) | |
782 | except: pass |
|
782 | except: pass | |
783 | if a: |
|
783 | if a: | |
784 | repo.dirstate.forget(a) |
|
784 | repo.dirstate.forget(a) | |
785 | repo.dirstate.setparents(qp, revlog.nullid) |
|
785 | repo.dirstate.setparents(qp, revlog.nullid) | |
786 | self.strip(repo, rev, update=False, backup='strip', wlock=wlock) |
|
786 | self.strip(repo, rev, update=False, backup='strip', wlock=wlock) | |
787 | del self.applied[start:end] |
|
787 | del self.applied[start:end] | |
788 | if len(self.applied): |
|
788 | if len(self.applied): | |
789 | self.ui.write("Now at: %s\n" % self.applied[-1].name) |
|
789 | self.ui.write("Now at: %s\n" % self.applied[-1].name) | |
790 | else: |
|
790 | else: | |
791 | self.ui.write("Patch queue now empty\n") |
|
791 | self.ui.write("Patch queue now empty\n") | |
792 |
|
792 | |||
793 | def diff(self, repo, files): |
|
793 | def diff(self, repo, files): | |
794 | top = self.check_toppatch(repo) |
|
794 | top = self.check_toppatch(repo) | |
795 | if not top: |
|
795 | if not top: | |
796 | self.ui.write("No patches applied\n") |
|
796 | self.ui.write("No patches applied\n") | |
797 | return |
|
797 | return | |
798 | qp = self.qparents(repo, top) |
|
798 | qp = self.qparents(repo, top) | |
799 | commands.dodiff(sys.stdout, self.ui, repo, qp, None, files) |
|
799 | commands.dodiff(sys.stdout, self.ui, repo, qp, None, files) | |
800 |
|
800 | |||
801 | def refresh(self, repo, msg=None, short=False): |
|
801 | def refresh(self, repo, msg=None, short=False): | |
802 | if len(self.applied) == 0: |
|
802 | if len(self.applied) == 0: | |
803 | self.ui.write("No patches applied\n") |
|
803 | self.ui.write("No patches applied\n") | |
804 | return |
|
804 | return | |
805 | wlock = repo.wlock() |
|
805 | wlock = repo.wlock() | |
806 | self.check_toppatch(repo) |
|
806 | self.check_toppatch(repo) | |
807 | (top, patch) = (self.applied[-1].rev, self.applied[-1].name) |
|
807 | (top, patch) = (self.applied[-1].rev, self.applied[-1].name) | |
808 | top = revlog.bin(top) |
|
808 | top = revlog.bin(top) | |
809 | cparents = repo.changelog.parents(top) |
|
809 | cparents = repo.changelog.parents(top) | |
810 | patchparent = self.qparents(repo, top) |
|
810 | patchparent = self.qparents(repo, top) | |
811 | message, comments, user, date, patchfound = self.readheaders(patch) |
|
811 | message, comments, user, date, patchfound = self.readheaders(patch) | |
812 |
|
812 | |||
813 | patchf = self.opener(patch, "w") |
|
813 | patchf = self.opener(patch, "w") | |
814 | msg = msg.rstrip() |
|
814 | msg = msg.rstrip() | |
815 | if msg: |
|
815 | if msg: | |
816 | if comments: |
|
816 | if comments: | |
817 | # Remove existing message. |
|
817 | # Remove existing message. | |
818 | ci = 0 |
|
818 | ci = 0 | |
819 | for mi in range(len(message)): |
|
819 | for mi in range(len(message)): | |
820 | while message[mi] != comments[ci]: |
|
820 | while message[mi] != comments[ci]: | |
821 | ci += 1 |
|
821 | ci += 1 | |
822 | del comments[ci] |
|
822 | del comments[ci] | |
823 | comments.append(msg) |
|
823 | comments.append(msg) | |
824 | if comments: |
|
824 | if comments: | |
825 | comments = "\n".join(comments) + '\n\n' |
|
825 | comments = "\n".join(comments) + '\n\n' | |
826 | patchf.write(comments) |
|
826 | patchf.write(comments) | |
827 |
|
827 | |||
828 | tip = repo.changelog.tip() |
|
828 | tip = repo.changelog.tip() | |
829 | if top == tip: |
|
829 | if top == tip: | |
830 | # if the top of our patch queue is also the tip, there is an |
|
830 | # if the top of our patch queue is also the tip, there is an | |
831 | # optimization here. We update the dirstate in place and strip |
|
831 | # optimization here. We update the dirstate in place and strip | |
832 | # off the tip commit. Then just commit the current directory |
|
832 | # off the tip commit. Then just commit the current directory | |
833 | # tree. We can also send repo.commit the list of files |
|
833 | # tree. We can also send repo.commit the list of files | |
834 | # changed to speed up the diff |
|
834 | # changed to speed up the diff | |
835 | # |
|
835 | # | |
836 | # in short mode, we only diff the files included in the |
|
836 | # in short mode, we only diff the files included in the | |
837 | # patch already |
|
837 | # patch already | |
838 | # |
|
838 | # | |
839 | # this should really read: |
|
839 | # this should really read: | |
840 | #(cc, dd, aa, aa2, uu) = repo.changes(tip, patchparent) |
|
840 | #(cc, dd, aa, aa2, uu) = repo.changes(tip, patchparent) | |
841 | # but we do it backwards to take advantage of manifest/chlog |
|
841 | # but we do it backwards to take advantage of manifest/chlog | |
842 | # caching against the next repo.changes call |
|
842 | # caching against the next repo.changes call | |
843 | # |
|
843 | # | |
844 | (cc, aa, dd, aa2, uu) = repo.changes(patchparent, tip) |
|
844 | (cc, aa, dd, aa2, uu) = repo.changes(patchparent, tip) | |
845 | if short: |
|
845 | if short: | |
846 | filelist = cc + aa + dd |
|
846 | filelist = cc + aa + dd | |
847 | else: |
|
847 | else: | |
848 | filelist = None |
|
848 | filelist = None | |
849 | (c, a, r, d, u) = repo.changes(None, None, filelist) |
|
849 | (c, a, r, d, u) = repo.changes(None, None, filelist) | |
850 |
|
850 | |||
851 | # we might end up with files that were added between tip and |
|
851 | # we might end up with files that were added between tip and | |
852 | # the dirstate parent, but then changed in the local dirstate. |
|
852 | # the dirstate parent, but then changed in the local dirstate. | |
853 | # in this case, we want them to only show up in the added section |
|
853 | # in this case, we want them to only show up in the added section | |
854 | for x in c: |
|
854 | for x in c: | |
855 | if x not in aa: |
|
855 | if x not in aa: | |
856 | cc.append(x) |
|
856 | cc.append(x) | |
857 | # we might end up with files added by the local dirstate that |
|
857 | # we might end up with files added by the local dirstate that | |
858 | # were deleted by the patch. In this case, they should only |
|
858 | # were deleted by the patch. In this case, they should only | |
859 | # show up in the changed section. |
|
859 | # show up in the changed section. | |
860 | for x in a: |
|
860 | for x in a: | |
861 | if x in dd: |
|
861 | if x in dd: | |
862 | del dd[dd.index(x)] |
|
862 | del dd[dd.index(x)] | |
863 | cc.append(x) |
|
863 | cc.append(x) | |
864 | else: |
|
864 | else: | |
865 | aa.append(x) |
|
865 | aa.append(x) | |
866 | # make sure any files deleted in the local dirstate |
|
866 | # make sure any files deleted in the local dirstate | |
867 | # are not in the add or change column of the patch |
|
867 | # are not in the add or change column of the patch | |
868 | forget = [] |
|
868 | forget = [] | |
869 | for x in d + r: |
|
869 | for x in d + r: | |
870 | if x in aa: |
|
870 | if x in aa: | |
871 | del aa[aa.index(x)] |
|
871 | del aa[aa.index(x)] | |
872 | forget.append(x) |
|
872 | forget.append(x) | |
873 | continue |
|
873 | continue | |
874 | elif x in cc: |
|
874 | elif x in cc: | |
875 | del cc[cc.index(x)] |
|
875 | del cc[cc.index(x)] | |
876 | dd.append(x) |
|
876 | dd.append(x) | |
877 |
|
877 | |||
878 | c = list(util.unique(cc)) |
|
878 | c = list(util.unique(cc)) | |
879 | r = list(util.unique(dd)) |
|
879 | r = list(util.unique(dd)) | |
880 | a = list(util.unique(aa)) |
|
880 | a = list(util.unique(aa)) | |
881 | filelist = list(util.unique(c + r + a )) |
|
881 | filelist = list(util.unique(c + r + a )) | |
882 | commands.dodiff(patchf, self.ui, repo, patchparent, None, |
|
882 | commands.dodiff(patchf, self.ui, repo, patchparent, None, | |
883 | filelist, changes=(c, a, r, [], u)) |
|
883 | filelist, changes=(c, a, r, [], u)) | |
884 | patchf.close() |
|
884 | patchf.close() | |
885 |
|
885 | |||
886 | changes = repo.changelog.read(tip) |
|
886 | changes = repo.changelog.read(tip) | |
887 | repo.dirstate.setparents(*cparents) |
|
887 | repo.dirstate.setparents(*cparents) | |
888 | repo.dirstate.update(a, 'a') |
|
888 | repo.dirstate.update(a, 'a') | |
889 | repo.dirstate.update(r, 'r') |
|
889 | repo.dirstate.update(r, 'r') | |
890 | repo.dirstate.update(c, 'n') |
|
890 | repo.dirstate.update(c, 'n') | |
891 | repo.dirstate.forget(forget) |
|
891 | repo.dirstate.forget(forget) | |
892 |
|
892 | |||
893 | if not msg: |
|
893 | if not msg: | |
894 | if not message: |
|
894 | if not message: | |
895 | message = "patch queue: %s\n" % patch |
|
895 | message = "patch queue: %s\n" % patch | |
896 | else: |
|
896 | else: | |
897 | message = "\n".join(message) |
|
897 | message = "\n".join(message) | |
898 | else: |
|
898 | else: | |
899 | message = msg |
|
899 | message = msg | |
900 |
|
900 | |||
901 | self.strip(repo, top, update=False, backup='strip', wlock=wlock) |
|
901 | self.strip(repo, top, update=False, backup='strip', wlock=wlock) | |
902 | n = repo.commit(filelist, message, changes[1], force=1, wlock=wlock) |
|
902 | n = repo.commit(filelist, message, changes[1], force=1, wlock=wlock) | |
903 | self.applied[-1] = StatusEntry(revlog.hex(n), patch) |
|
903 | self.applied[-1] = StatusEntry(revlog.hex(n), patch) | |
904 | self.applied_dirty = 1 |
|
904 | self.applied_dirty = 1 | |
905 | else: |
|
905 | else: | |
906 | commands.dodiff(patchf, self.ui, repo, patchparent, None) |
|
906 | commands.dodiff(patchf, self.ui, repo, patchparent, None) | |
907 | patchf.close() |
|
907 | patchf.close() | |
908 | self.pop(repo, force=True, wlock=wlock) |
|
908 | self.pop(repo, force=True, wlock=wlock) | |
909 | self.push(repo, force=True, wlock=wlock) |
|
909 | self.push(repo, force=True, wlock=wlock) | |
910 |
|
910 | |||
911 | def init(self, repo, create=False): |
|
911 | def init(self, repo, create=False): | |
912 | if os.path.isdir(self.path): |
|
912 | if os.path.isdir(self.path): | |
913 | raise util.Abort(_("patch queue directory already exists")) |
|
913 | raise util.Abort(_("patch queue directory already exists")) | |
914 | os.mkdir(self.path) |
|
914 | os.mkdir(self.path) | |
915 | if create: |
|
915 | if create: | |
916 | return self.qrepo(create=True) |
|
916 | return self.qrepo(create=True) | |
917 |
|
917 | |||
918 | def unapplied(self, repo, patch=None): |
|
918 | def unapplied(self, repo, patch=None): | |
919 | if patch and patch not in self.series: |
|
919 | if patch and patch not in self.series: | |
920 | raise util.Abort(_("patch %s is not in series file") % patch) |
|
920 | raise util.Abort(_("patch %s is not in series file") % patch) | |
921 | if not patch: |
|
921 | if not patch: | |
922 | start = self.series_end() |
|
922 | start = self.series_end() | |
923 | else: |
|
923 | else: | |
924 | start = self.series.index(patch) + 1 |
|
924 | start = self.series.index(patch) + 1 | |
925 | return [(i, self.series[i]) for i in xrange(start, len(self.series))] |
|
925 | return [(i, self.series[i]) for i in xrange(start, len(self.series))] | |
926 |
|
926 | |||
927 | def qseries(self, repo, missing=None, summary=False): |
|
927 | def qseries(self, repo, missing=None, summary=False): | |
928 | start = self.series_end() |
|
928 | start = self.series_end() | |
929 | if not missing: |
|
929 | if not missing: | |
930 | for i in range(len(self.series)): |
|
930 | for i in range(len(self.series)): | |
931 | patch = self.series[i] |
|
931 | patch = self.series[i] | |
932 | if self.ui.verbose: |
|
932 | if self.ui.verbose: | |
933 | if i < start: |
|
933 | if i < start: | |
934 | status = 'A' |
|
934 | status = 'A' | |
935 | else: |
|
935 | else: | |
936 | status = 'U' |
|
936 | status = 'U' | |
937 | self.ui.write('%d %s ' % (i, status)) |
|
937 | self.ui.write('%d %s ' % (i, status)) | |
938 | if summary: |
|
938 | if summary: | |
939 | msg = self.readheaders(patch)[0] |
|
939 | msg = self.readheaders(patch)[0] | |
940 | msg = msg and ': ' + msg[0] or ': ' |
|
940 | msg = msg and ': ' + msg[0] or ': ' | |
941 | else: |
|
941 | else: | |
942 | msg = '' |
|
942 | msg = '' | |
943 | self.ui.write('%s%s\n' % (patch, msg)) |
|
943 | self.ui.write('%s%s\n' % (patch, msg)) | |
944 | else: |
|
944 | else: | |
945 | msng_list = [] |
|
945 | msng_list = [] | |
946 | for root, dirs, files in os.walk(self.path): |
|
946 | for root, dirs, files in os.walk(self.path): | |
947 | d = root[len(self.path) + 1:] |
|
947 | d = root[len(self.path) + 1:] | |
948 | for f in files: |
|
948 | for f in files: | |
949 | fl = os.path.join(d, f) |
|
949 | fl = os.path.join(d, f) | |
950 | if (fl not in self.series and |
|
950 | if (fl not in self.series and | |
951 | fl not in (self.status_path, self.series_path) |
|
951 | fl not in (self.status_path, self.series_path) | |
952 | and not fl.startswith('.')): |
|
952 | and not fl.startswith('.')): | |
953 | msng_list.append(fl) |
|
953 | msng_list.append(fl) | |
954 | msng_list.sort() |
|
954 | msng_list.sort() | |
955 | for x in msng_list: |
|
955 | for x in msng_list: | |
956 | if self.ui.verbose: |
|
956 | if self.ui.verbose: | |
957 | self.ui.write("D ") |
|
957 | self.ui.write("D ") | |
958 | self.ui.write("%s\n" % x) |
|
958 | self.ui.write("%s\n" % x) | |
959 |
|
959 | |||
960 | def issaveline(self, l): |
|
960 | def issaveline(self, l): | |
961 | name = l.split(':')[1] |
|
961 | name = l.split(':')[1] | |
962 | if name == '.hg.patches.save.line': |
|
962 | if name == '.hg.patches.save.line': | |
963 | return True |
|
963 | return True | |
964 |
|
964 | |||
965 | def qrepo(self, create=False): |
|
965 | def qrepo(self, create=False): | |
966 | if create or os.path.isdir(os.path.join(self.path, ".hg")): |
|
966 | if create or os.path.isdir(os.path.join(self.path, ".hg")): | |
967 | return hg.repository(self.ui, path=self.path, create=create) |
|
967 | return hg.repository(self.ui, path=self.path, create=create) | |
968 |
|
968 | |||
969 | def restore(self, repo, rev, delete=None, qupdate=None): |
|
969 | def restore(self, repo, rev, delete=None, qupdate=None): | |
970 | c = repo.changelog.read(rev) |
|
970 | c = repo.changelog.read(rev) | |
971 | desc = c[4].strip() |
|
971 | desc = c[4].strip() | |
972 | lines = desc.splitlines() |
|
972 | lines = desc.splitlines() | |
973 | i = 0 |
|
973 | i = 0 | |
974 | datastart = None |
|
974 | datastart = None | |
975 | series = [] |
|
975 | series = [] | |
976 | applied = [] |
|
976 | applied = [] | |
977 | qpp = None |
|
977 | qpp = None | |
978 | for i in xrange(0, len(lines)): |
|
978 | for i in xrange(0, len(lines)): | |
979 | if lines[i] == 'Patch Data:': |
|
979 | if lines[i] == 'Patch Data:': | |
980 | datastart = i + 1 |
|
980 | datastart = i + 1 | |
981 | elif lines[i].startswith('Dirstate:'): |
|
981 | elif lines[i].startswith('Dirstate:'): | |
982 | l = lines[i].rstrip() |
|
982 | l = lines[i].rstrip() | |
983 | l = l[10:].split(' ') |
|
983 | l = l[10:].split(' ') | |
984 | qpp = [ hg.bin(x) for x in l ] |
|
984 | qpp = [ hg.bin(x) for x in l ] | |
985 | elif datastart != None: |
|
985 | elif datastart != None: | |
986 | l = lines[i].rstrip() |
|
986 | l = lines[i].rstrip() | |
987 | se = StatusEntry(l) |
|
987 | se = StatusEntry(l) | |
988 | file_ = se.name |
|
988 | file_ = se.name | |
989 | if se.rev: |
|
989 | if se.rev: | |
990 | applied.append(se) |
|
990 | applied.append(se) | |
991 | series.append(file_) |
|
991 | series.append(file_) | |
992 | if datastart == None: |
|
992 | if datastart == None: | |
993 | self.ui.warn("No saved patch data found\n") |
|
993 | self.ui.warn("No saved patch data found\n") | |
994 | return 1 |
|
994 | return 1 | |
995 | self.ui.warn("restoring status: %s\n" % lines[0]) |
|
995 | self.ui.warn("restoring status: %s\n" % lines[0]) | |
996 | self.full_series = series |
|
996 | self.full_series = series | |
997 | self.applied = applied |
|
997 | self.applied = applied | |
998 | self.parse_series() |
|
998 | self.parse_series() | |
999 | self.series_dirty = 1 |
|
999 | self.series_dirty = 1 | |
1000 | self.applied_dirty = 1 |
|
1000 | self.applied_dirty = 1 | |
1001 | heads = repo.changelog.heads() |
|
1001 | heads = repo.changelog.heads() | |
1002 | if delete: |
|
1002 | if delete: | |
1003 | if rev not in heads: |
|
1003 | if rev not in heads: | |
1004 | self.ui.warn("save entry has children, leaving it alone\n") |
|
1004 | self.ui.warn("save entry has children, leaving it alone\n") | |
1005 | else: |
|
1005 | else: | |
1006 | self.ui.warn("removing save entry %s\n" % hg.short(rev)) |
|
1006 | self.ui.warn("removing save entry %s\n" % hg.short(rev)) | |
1007 | pp = repo.dirstate.parents() |
|
1007 | pp = repo.dirstate.parents() | |
1008 | if rev in pp: |
|
1008 | if rev in pp: | |
1009 | update = True |
|
1009 | update = True | |
1010 | else: |
|
1010 | else: | |
1011 | update = False |
|
1011 | update = False | |
1012 | self.strip(repo, rev, update=update, backup='strip') |
|
1012 | self.strip(repo, rev, update=update, backup='strip') | |
1013 | if qpp: |
|
1013 | if qpp: | |
1014 | self.ui.warn("saved queue repository parents: %s %s\n" % |
|
1014 | self.ui.warn("saved queue repository parents: %s %s\n" % | |
1015 | (hg.short(qpp[0]), hg.short(qpp[1]))) |
|
1015 | (hg.short(qpp[0]), hg.short(qpp[1]))) | |
1016 | if qupdate: |
|
1016 | if qupdate: | |
1017 | print "queue directory updating" |
|
1017 | print "queue directory updating" | |
1018 | r = self.qrepo() |
|
1018 | r = self.qrepo() | |
1019 | if not r: |
|
1019 | if not r: | |
1020 | self.ui.warn("Unable to load queue repository\n") |
|
1020 | self.ui.warn("Unable to load queue repository\n") | |
1021 | return 1 |
|
1021 | return 1 | |
1022 |
hg. |
|
1022 | hg.clean(r, qpp[0]) | |
1023 |
|
1023 | |||
1024 | def save(self, repo, msg=None): |
|
1024 | def save(self, repo, msg=None): | |
1025 | if len(self.applied) == 0: |
|
1025 | if len(self.applied) == 0: | |
1026 | self.ui.warn("save: no patches applied, exiting\n") |
|
1026 | self.ui.warn("save: no patches applied, exiting\n") | |
1027 | return 1 |
|
1027 | return 1 | |
1028 | if self.issaveline(self.applied[-1]): |
|
1028 | if self.issaveline(self.applied[-1]): | |
1029 | self.ui.warn("status is already saved\n") |
|
1029 | self.ui.warn("status is already saved\n") | |
1030 | return 1 |
|
1030 | return 1 | |
1031 |
|
1031 | |||
1032 | ar = [ ':' + x for x in self.full_series ] |
|
1032 | ar = [ ':' + x for x in self.full_series ] | |
1033 | if not msg: |
|
1033 | if not msg: | |
1034 | msg = "hg patches saved state" |
|
1034 | msg = "hg patches saved state" | |
1035 | else: |
|
1035 | else: | |
1036 | msg = "hg patches: " + msg.rstrip('\r\n') |
|
1036 | msg = "hg patches: " + msg.rstrip('\r\n') | |
1037 | r = self.qrepo() |
|
1037 | r = self.qrepo() | |
1038 | if r: |
|
1038 | if r: | |
1039 | pp = r.dirstate.parents() |
|
1039 | pp = r.dirstate.parents() | |
1040 | msg += "\nDirstate: %s %s" % (hg.hex(pp[0]), hg.hex(pp[1])) |
|
1040 | msg += "\nDirstate: %s %s" % (hg.hex(pp[0]), hg.hex(pp[1])) | |
1041 | msg += "\n\nPatch Data:\n" |
|
1041 | msg += "\n\nPatch Data:\n" | |
1042 | text = msg + "\n".join(str(self.applied)) + '\n' + (ar and "\n".join(ar) |
|
1042 | text = msg + "\n".join(str(self.applied)) + '\n' + (ar and "\n".join(ar) | |
1043 | + '\n' or "") |
|
1043 | + '\n' or "") | |
1044 | n = repo.commit(None, text, user=None, force=1) |
|
1044 | n = repo.commit(None, text, user=None, force=1) | |
1045 | if not n: |
|
1045 | if not n: | |
1046 | self.ui.warn("repo commit failed\n") |
|
1046 | self.ui.warn("repo commit failed\n") | |
1047 | return 1 |
|
1047 | return 1 | |
1048 | self.applied.append(StatusEntry(revlog.hex(n),'.hg.patches.save.line')) |
|
1048 | self.applied.append(StatusEntry(revlog.hex(n),'.hg.patches.save.line')) | |
1049 | self.applied_dirty = 1 |
|
1049 | self.applied_dirty = 1 | |
1050 |
|
1050 | |||
1051 | def full_series_end(self): |
|
1051 | def full_series_end(self): | |
1052 | if len(self.applied) > 0: |
|
1052 | if len(self.applied) > 0: | |
1053 | p = self.applied[-1].name |
|
1053 | p = self.applied[-1].name | |
1054 | end = self.find_series(p) |
|
1054 | end = self.find_series(p) | |
1055 | if end == None: |
|
1055 | if end == None: | |
1056 | return len(self.full_series) |
|
1056 | return len(self.full_series) | |
1057 | return end + 1 |
|
1057 | return end + 1 | |
1058 | return 0 |
|
1058 | return 0 | |
1059 |
|
1059 | |||
1060 | def series_end(self): |
|
1060 | def series_end(self): | |
1061 | end = 0 |
|
1061 | end = 0 | |
1062 | if len(self.applied) > 0: |
|
1062 | if len(self.applied) > 0: | |
1063 | p = self.applied[-1].name |
|
1063 | p = self.applied[-1].name | |
1064 | try: |
|
1064 | try: | |
1065 | end = self.series.index(p) |
|
1065 | end = self.series.index(p) | |
1066 | except ValueError: |
|
1066 | except ValueError: | |
1067 | return 0 |
|
1067 | return 0 | |
1068 | return end + 1 |
|
1068 | return end + 1 | |
1069 | return end |
|
1069 | return end | |
1070 |
|
1070 | |||
1071 | def qapplied(self, repo, patch=None): |
|
1071 | def qapplied(self, repo, patch=None): | |
1072 | if patch and patch not in self.series: |
|
1072 | if patch and patch not in self.series: | |
1073 | raise util.Abort(_("patch %s is not in series file") % patch) |
|
1073 | raise util.Abort(_("patch %s is not in series file") % patch) | |
1074 | if not patch: |
|
1074 | if not patch: | |
1075 | end = len(self.applied) |
|
1075 | end = len(self.applied) | |
1076 | else: |
|
1076 | else: | |
1077 | end = self.series.index(patch) + 1 |
|
1077 | end = self.series.index(patch) + 1 | |
1078 | for x in xrange(end): |
|
1078 | for x in xrange(end): | |
1079 | p = self.appliedname(x) |
|
1079 | p = self.appliedname(x) | |
1080 | self.ui.write("%s\n" % p) |
|
1080 | self.ui.write("%s\n" % p) | |
1081 |
|
1081 | |||
1082 | def appliedname(self, index): |
|
1082 | def appliedname(self, index): | |
1083 | pname = self.applied[index].name |
|
1083 | pname = self.applied[index].name | |
1084 | if not self.ui.verbose: |
|
1084 | if not self.ui.verbose: | |
1085 | p = pname |
|
1085 | p = pname | |
1086 | else: |
|
1086 | else: | |
1087 | p = str(self.series.index(pname)) + " " + p |
|
1087 | p = str(self.series.index(pname)) + " " + p | |
1088 | return p |
|
1088 | return p | |
1089 |
|
1089 | |||
1090 | def top(self, repo): |
|
1090 | def top(self, repo): | |
1091 | if len(self.applied): |
|
1091 | if len(self.applied): | |
1092 | p = self.appliedname(-1) |
|
1092 | p = self.appliedname(-1) | |
1093 | self.ui.write(p + '\n') |
|
1093 | self.ui.write(p + '\n') | |
1094 | else: |
|
1094 | else: | |
1095 | self.ui.write("No patches applied\n") |
|
1095 | self.ui.write("No patches applied\n") | |
1096 |
|
1096 | |||
1097 | def next(self, repo): |
|
1097 | def next(self, repo): | |
1098 | end = self.series_end() |
|
1098 | end = self.series_end() | |
1099 | if end == len(self.series): |
|
1099 | if end == len(self.series): | |
1100 | self.ui.write("All patches applied\n") |
|
1100 | self.ui.write("All patches applied\n") | |
1101 | else: |
|
1101 | else: | |
1102 | p = self.series[end] |
|
1102 | p = self.series[end] | |
1103 | if self.ui.verbose: |
|
1103 | if self.ui.verbose: | |
1104 | self.ui.write("%d " % self.series.index(p)) |
|
1104 | self.ui.write("%d " % self.series.index(p)) | |
1105 | self.ui.write(p + '\n') |
|
1105 | self.ui.write(p + '\n') | |
1106 |
|
1106 | |||
1107 | def prev(self, repo): |
|
1107 | def prev(self, repo): | |
1108 | if len(self.applied) > 1: |
|
1108 | if len(self.applied) > 1: | |
1109 | p = self.appliedname(-2) |
|
1109 | p = self.appliedname(-2) | |
1110 | self.ui.write(p + '\n') |
|
1110 | self.ui.write(p + '\n') | |
1111 | elif len(self.applied) == 1: |
|
1111 | elif len(self.applied) == 1: | |
1112 | self.ui.write("Only one patch applied\n") |
|
1112 | self.ui.write("Only one patch applied\n") | |
1113 | else: |
|
1113 | else: | |
1114 | self.ui.write("No patches applied\n") |
|
1114 | self.ui.write("No patches applied\n") | |
1115 |
|
1115 | |||
1116 | def qimport(self, repo, files, patch=None, existing=None, force=None): |
|
1116 | def qimport(self, repo, files, patch=None, existing=None, force=None): | |
1117 | if len(files) > 1 and patch: |
|
1117 | if len(files) > 1 and patch: | |
1118 | raise util.Abort(_('option "-n" not valid when importing multiple ' |
|
1118 | raise util.Abort(_('option "-n" not valid when importing multiple ' | |
1119 | 'files')) |
|
1119 | 'files')) | |
1120 | i = 0 |
|
1120 | i = 0 | |
1121 | added = [] |
|
1121 | added = [] | |
1122 | for filename in files: |
|
1122 | for filename in files: | |
1123 | if existing: |
|
1123 | if existing: | |
1124 | if not patch: |
|
1124 | if not patch: | |
1125 | patch = filename |
|
1125 | patch = filename | |
1126 | if not os.path.isfile(os.path.join(self.path, patch)): |
|
1126 | if not os.path.isfile(os.path.join(self.path, patch)): | |
1127 | raise util.Abort(_("patch %s does not exist") % patch) |
|
1127 | raise util.Abort(_("patch %s does not exist") % patch) | |
1128 | else: |
|
1128 | else: | |
1129 | try: |
|
1129 | try: | |
1130 | text = file(filename).read() |
|
1130 | text = file(filename).read() | |
1131 | except IOError: |
|
1131 | except IOError: | |
1132 | raise util.Abort(_("unable to read %s") % patch) |
|
1132 | raise util.Abort(_("unable to read %s") % patch) | |
1133 | if not patch: |
|
1133 | if not patch: | |
1134 | patch = os.path.split(filename)[1] |
|
1134 | patch = os.path.split(filename)[1] | |
1135 | if not force and os.path.exists(os.path.join(self.path, patch)): |
|
1135 | if not force and os.path.exists(os.path.join(self.path, patch)): | |
1136 | raise util.Abort(_('patch "%s" already exists') % patch) |
|
1136 | raise util.Abort(_('patch "%s" already exists') % patch) | |
1137 | patchf = self.opener(patch, "w") |
|
1137 | patchf = self.opener(patch, "w") | |
1138 | patchf.write(text) |
|
1138 | patchf.write(text) | |
1139 | if patch in self.series: |
|
1139 | if patch in self.series: | |
1140 | raise util.Abort(_('patch %s is already in the series file') |
|
1140 | raise util.Abort(_('patch %s is already in the series file') | |
1141 | % patch) |
|
1141 | % patch) | |
1142 | index = self.full_series_end() + i |
|
1142 | index = self.full_series_end() + i | |
1143 | self.full_series[index:index] = [patch] |
|
1143 | self.full_series[index:index] = [patch] | |
1144 | self.parse_series() |
|
1144 | self.parse_series() | |
1145 | self.ui.warn("adding %s to series file\n" % patch) |
|
1145 | self.ui.warn("adding %s to series file\n" % patch) | |
1146 | i += 1 |
|
1146 | i += 1 | |
1147 | added.append(patch) |
|
1147 | added.append(patch) | |
1148 | patch = None |
|
1148 | patch = None | |
1149 | self.series_dirty = 1 |
|
1149 | self.series_dirty = 1 | |
1150 | qrepo = self.qrepo() |
|
1150 | qrepo = self.qrepo() | |
1151 | if qrepo: |
|
1151 | if qrepo: | |
1152 | qrepo.add(added) |
|
1152 | qrepo.add(added) | |
1153 |
|
1153 | |||
1154 | def delete(ui, repo, patch, **opts): |
|
1154 | def delete(ui, repo, patch, **opts): | |
1155 | """remove a patch from the series file |
|
1155 | """remove a patch from the series file | |
1156 |
|
1156 | |||
1157 | The patch must not be applied. |
|
1157 | The patch must not be applied. | |
1158 | With -f, deletes the patch file as well as the series entry.""" |
|
1158 | With -f, deletes the patch file as well as the series entry.""" | |
1159 | q = repo.mq |
|
1159 | q = repo.mq | |
1160 | q.delete(repo, patch, force=opts.get('force')) |
|
1160 | q.delete(repo, patch, force=opts.get('force')) | |
1161 | q.save_dirty() |
|
1161 | q.save_dirty() | |
1162 | return 0 |
|
1162 | return 0 | |
1163 |
|
1163 | |||
1164 | def applied(ui, repo, patch=None, **opts): |
|
1164 | def applied(ui, repo, patch=None, **opts): | |
1165 | """print the patches already applied""" |
|
1165 | """print the patches already applied""" | |
1166 | repo.mq.qapplied(repo, patch) |
|
1166 | repo.mq.qapplied(repo, patch) | |
1167 | return 0 |
|
1167 | return 0 | |
1168 |
|
1168 | |||
1169 | def unapplied(ui, repo, patch=None, **opts): |
|
1169 | def unapplied(ui, repo, patch=None, **opts): | |
1170 | """print the patches not yet applied""" |
|
1170 | """print the patches not yet applied""" | |
1171 | for i, p in repo.mq.unapplied(repo, patch): |
|
1171 | for i, p in repo.mq.unapplied(repo, patch): | |
1172 | if ui.verbose: |
|
1172 | if ui.verbose: | |
1173 | ui.write("%d " % i) |
|
1173 | ui.write("%d " % i) | |
1174 | ui.write("%s\n" % p) |
|
1174 | ui.write("%s\n" % p) | |
1175 |
|
1175 | |||
1176 | def qimport(ui, repo, *filename, **opts): |
|
1176 | def qimport(ui, repo, *filename, **opts): | |
1177 | """import a patch""" |
|
1177 | """import a patch""" | |
1178 | q = repo.mq |
|
1178 | q = repo.mq | |
1179 | q.qimport(repo, filename, patch=opts['name'], |
|
1179 | q.qimport(repo, filename, patch=opts['name'], | |
1180 | existing=opts['existing'], force=opts['force']) |
|
1180 | existing=opts['existing'], force=opts['force']) | |
1181 | q.save_dirty() |
|
1181 | q.save_dirty() | |
1182 | return 0 |
|
1182 | return 0 | |
1183 |
|
1183 | |||
1184 | def init(ui, repo, **opts): |
|
1184 | def init(ui, repo, **opts): | |
1185 | """init a new queue repository |
|
1185 | """init a new queue repository | |
1186 |
|
1186 | |||
1187 | The queue repository is unversioned by default. If -c is |
|
1187 | The queue repository is unversioned by default. If -c is | |
1188 | specified, qinit will create a separate nested repository |
|
1188 | specified, qinit will create a separate nested repository | |
1189 | for patches. Use qcommit to commit changes to this queue |
|
1189 | for patches. Use qcommit to commit changes to this queue | |
1190 | repository.""" |
|
1190 | repository.""" | |
1191 | q = repo.mq |
|
1191 | q = repo.mq | |
1192 | r = q.init(repo, create=opts['create_repo']) |
|
1192 | r = q.init(repo, create=opts['create_repo']) | |
1193 | q.save_dirty() |
|
1193 | q.save_dirty() | |
1194 | if r: |
|
1194 | if r: | |
1195 | fp = r.wopener('.hgignore', 'w') |
|
1195 | fp = r.wopener('.hgignore', 'w') | |
1196 | print >> fp, 'syntax: glob' |
|
1196 | print >> fp, 'syntax: glob' | |
1197 | print >> fp, 'status' |
|
1197 | print >> fp, 'status' | |
1198 | fp.close() |
|
1198 | fp.close() | |
1199 | r.wopener('series', 'w').close() |
|
1199 | r.wopener('series', 'w').close() | |
1200 | r.add(['.hgignore', 'series']) |
|
1200 | r.add(['.hgignore', 'series']) | |
1201 | return 0 |
|
1201 | return 0 | |
1202 |
|
1202 | |||
1203 | def clone(ui, source, dest=None, **opts): |
|
1203 | def clone(ui, source, dest=None, **opts): | |
1204 | '''clone main and patch repository at same time |
|
1204 | '''clone main and patch repository at same time | |
1205 |
|
1205 | |||
1206 | If source is local, destination will have no patches applied. If |
|
1206 | If source is local, destination will have no patches applied. If | |
1207 | source is remote, this command can not check if patches are |
|
1207 | source is remote, this command can not check if patches are | |
1208 | applied in source, so cannot guarantee that patches are not |
|
1208 | applied in source, so cannot guarantee that patches are not | |
1209 | applied in destination. If you clone remote repository, be sure |
|
1209 | applied in destination. If you clone remote repository, be sure | |
1210 | before that it has no patches applied. |
|
1210 | before that it has no patches applied. | |
1211 |
|
1211 | |||
1212 | Source patch repository is looked for in <src>/.hg/patches by |
|
1212 | Source patch repository is looked for in <src>/.hg/patches by | |
1213 | default. Use -p <url> to change. |
|
1213 | default. Use -p <url> to change. | |
1214 | ''' |
|
1214 | ''' | |
1215 | commands.setremoteconfig(ui, opts) |
|
1215 | commands.setremoteconfig(ui, opts) | |
1216 | if dest is None: |
|
1216 | if dest is None: | |
1217 | dest = hg.defaultdest(source) |
|
1217 | dest = hg.defaultdest(source) | |
1218 | sr = hg.repository(ui, ui.expandpath(source)) |
|
1218 | sr = hg.repository(ui, ui.expandpath(source)) | |
1219 | qbase, destrev = None, None |
|
1219 | qbase, destrev = None, None | |
1220 | if sr.local(): |
|
1220 | if sr.local(): | |
1221 | reposetup(ui, sr) |
|
1221 | reposetup(ui, sr) | |
1222 | if sr.mq.applied: |
|
1222 | if sr.mq.applied: | |
1223 | qbase = revlog.bin(sr.mq.applied[0].rev) |
|
1223 | qbase = revlog.bin(sr.mq.applied[0].rev) | |
1224 | if not hg.islocal(dest): |
|
1224 | if not hg.islocal(dest): | |
1225 | destrev = sr.parents(qbase)[0] |
|
1225 | destrev = sr.parents(qbase)[0] | |
1226 | ui.note(_('cloning main repo\n')) |
|
1226 | ui.note(_('cloning main repo\n')) | |
1227 | sr, dr = hg.clone(ui, sr, dest, |
|
1227 | sr, dr = hg.clone(ui, sr, dest, | |
1228 | pull=opts['pull'], |
|
1228 | pull=opts['pull'], | |
1229 | rev=destrev, |
|
1229 | rev=destrev, | |
1230 | update=False, |
|
1230 | update=False, | |
1231 | stream=opts['uncompressed']) |
|
1231 | stream=opts['uncompressed']) | |
1232 | ui.note(_('cloning patch repo\n')) |
|
1232 | ui.note(_('cloning patch repo\n')) | |
1233 | spr, dpr = hg.clone(ui, opts['patches'] or (sr.url() + '/.hg/patches'), |
|
1233 | spr, dpr = hg.clone(ui, opts['patches'] or (sr.url() + '/.hg/patches'), | |
1234 | dr.url() + '/.hg/patches', |
|
1234 | dr.url() + '/.hg/patches', | |
1235 | pull=opts['pull'], |
|
1235 | pull=opts['pull'], | |
1236 | update=not opts['noupdate'], |
|
1236 | update=not opts['noupdate'], | |
1237 | stream=opts['uncompressed']) |
|
1237 | stream=opts['uncompressed']) | |
1238 | if dr.local(): |
|
1238 | if dr.local(): | |
1239 | if qbase: |
|
1239 | if qbase: | |
1240 | ui.note(_('stripping applied patches from destination repo\n')) |
|
1240 | ui.note(_('stripping applied patches from destination repo\n')) | |
1241 | reposetup(ui, dr) |
|
1241 | reposetup(ui, dr) | |
1242 | dr.mq.strip(dr, qbase, update=False, backup=None) |
|
1242 | dr.mq.strip(dr, qbase, update=False, backup=None) | |
1243 | if not opts['noupdate']: |
|
1243 | if not opts['noupdate']: | |
1244 | ui.note(_('updating destination repo\n')) |
|
1244 | ui.note(_('updating destination repo\n')) | |
1245 | hg.update(dr, dr.changelog.tip()) |
|
1245 | hg.update(dr, dr.changelog.tip()) | |
1246 |
|
1246 | |||
1247 | def commit(ui, repo, *pats, **opts): |
|
1247 | def commit(ui, repo, *pats, **opts): | |
1248 | """commit changes in the queue repository""" |
|
1248 | """commit changes in the queue repository""" | |
1249 | q = repo.mq |
|
1249 | q = repo.mq | |
1250 | r = q.qrepo() |
|
1250 | r = q.qrepo() | |
1251 | if not r: raise util.Abort('no queue repository') |
|
1251 | if not r: raise util.Abort('no queue repository') | |
1252 | commands.commit(r.ui, r, *pats, **opts) |
|
1252 | commands.commit(r.ui, r, *pats, **opts) | |
1253 |
|
1253 | |||
1254 | def series(ui, repo, **opts): |
|
1254 | def series(ui, repo, **opts): | |
1255 | """print the entire series file""" |
|
1255 | """print the entire series file""" | |
1256 | repo.mq.qseries(repo, missing=opts['missing'], summary=opts['summary']) |
|
1256 | repo.mq.qseries(repo, missing=opts['missing'], summary=opts['summary']) | |
1257 | return 0 |
|
1257 | return 0 | |
1258 |
|
1258 | |||
1259 | def top(ui, repo, **opts): |
|
1259 | def top(ui, repo, **opts): | |
1260 | """print the name of the current patch""" |
|
1260 | """print the name of the current patch""" | |
1261 | repo.mq.top(repo) |
|
1261 | repo.mq.top(repo) | |
1262 | return 0 |
|
1262 | return 0 | |
1263 |
|
1263 | |||
1264 | def next(ui, repo, **opts): |
|
1264 | def next(ui, repo, **opts): | |
1265 | """print the name of the next patch""" |
|
1265 | """print the name of the next patch""" | |
1266 | repo.mq.next(repo) |
|
1266 | repo.mq.next(repo) | |
1267 | return 0 |
|
1267 | return 0 | |
1268 |
|
1268 | |||
1269 | def prev(ui, repo, **opts): |
|
1269 | def prev(ui, repo, **opts): | |
1270 | """print the name of the previous patch""" |
|
1270 | """print the name of the previous patch""" | |
1271 | repo.mq.prev(repo) |
|
1271 | repo.mq.prev(repo) | |
1272 | return 0 |
|
1272 | return 0 | |
1273 |
|
1273 | |||
1274 | def new(ui, repo, patch, **opts): |
|
1274 | def new(ui, repo, patch, **opts): | |
1275 | """create a new patch |
|
1275 | """create a new patch | |
1276 |
|
1276 | |||
1277 | qnew creates a new patch on top of the currently-applied patch |
|
1277 | qnew creates a new patch on top of the currently-applied patch | |
1278 | (if any). It will refuse to run if there are any outstanding |
|
1278 | (if any). It will refuse to run if there are any outstanding | |
1279 | changes unless -f is specified, in which case the patch will |
|
1279 | changes unless -f is specified, in which case the patch will | |
1280 | be initialised with them. |
|
1280 | be initialised with them. | |
1281 |
|
1281 | |||
1282 | -m or -l set the patch header as well as the commit message. |
|
1282 | -m or -l set the patch header as well as the commit message. | |
1283 | If neither is specified, the patch header is empty and the |
|
1283 | If neither is specified, the patch header is empty and the | |
1284 | commit message is 'New patch: PATCH'""" |
|
1284 | commit message is 'New patch: PATCH'""" | |
1285 | q = repo.mq |
|
1285 | q = repo.mq | |
1286 | message = commands.logmessage(opts) |
|
1286 | message = commands.logmessage(opts) | |
1287 | q.new(repo, patch, msg=message, force=opts['force']) |
|
1287 | q.new(repo, patch, msg=message, force=opts['force']) | |
1288 | q.save_dirty() |
|
1288 | q.save_dirty() | |
1289 | return 0 |
|
1289 | return 0 | |
1290 |
|
1290 | |||
1291 | def refresh(ui, repo, **opts): |
|
1291 | def refresh(ui, repo, **opts): | |
1292 | """update the current patch""" |
|
1292 | """update the current patch""" | |
1293 | q = repo.mq |
|
1293 | q = repo.mq | |
1294 | message = commands.logmessage(opts) |
|
1294 | message = commands.logmessage(opts) | |
1295 | if opts['edit']: |
|
1295 | if opts['edit']: | |
1296 | if message: |
|
1296 | if message: | |
1297 | raise util.Abort(_('option "-e" incompatible with "-m" or "-l"')) |
|
1297 | raise util.Abort(_('option "-e" incompatible with "-m" or "-l"')) | |
1298 | patch = q.applied[-1].name |
|
1298 | patch = q.applied[-1].name | |
1299 | (message, comment, user, date, hasdiff) = q.readheaders(patch) |
|
1299 | (message, comment, user, date, hasdiff) = q.readheaders(patch) | |
1300 | message = ui.edit('\n'.join(message), user or ui.username()) |
|
1300 | message = ui.edit('\n'.join(message), user or ui.username()) | |
1301 | q.refresh(repo, msg=message, short=opts['short']) |
|
1301 | q.refresh(repo, msg=message, short=opts['short']) | |
1302 | q.save_dirty() |
|
1302 | q.save_dirty() | |
1303 | return 0 |
|
1303 | return 0 | |
1304 |
|
1304 | |||
1305 | def diff(ui, repo, *files, **opts): |
|
1305 | def diff(ui, repo, *files, **opts): | |
1306 | """diff of the current patch""" |
|
1306 | """diff of the current patch""" | |
1307 | # deep in the dirstate code, the walkhelper method wants a list, not a tuple |
|
1307 | # deep in the dirstate code, the walkhelper method wants a list, not a tuple | |
1308 | repo.mq.diff(repo, list(files)) |
|
1308 | repo.mq.diff(repo, list(files)) | |
1309 | return 0 |
|
1309 | return 0 | |
1310 |
|
1310 | |||
1311 | def fold(ui, repo, *files, **opts): |
|
1311 | def fold(ui, repo, *files, **opts): | |
1312 | """fold the named patches into the current patch |
|
1312 | """fold the named patches into the current patch | |
1313 |
|
1313 | |||
1314 | Patches must not yet be applied. Each patch will be successively |
|
1314 | Patches must not yet be applied. Each patch will be successively | |
1315 | applied to the current patch in the order given. If all the |
|
1315 | applied to the current patch in the order given. If all the | |
1316 | patches apply successfully, the current patch will be refreshed |
|
1316 | patches apply successfully, the current patch will be refreshed | |
1317 | with the new cumulative patch, and the folded patches will |
|
1317 | with the new cumulative patch, and the folded patches will | |
1318 | be deleted. With -f/--force, the folded patch files will |
|
1318 | be deleted. With -f/--force, the folded patch files will | |
1319 | be removed afterwards. |
|
1319 | be removed afterwards. | |
1320 |
|
1320 | |||
1321 | The header for each folded patch will be concatenated with |
|
1321 | The header for each folded patch will be concatenated with | |
1322 | the current patch header, separated by a line of '* * *'.""" |
|
1322 | the current patch header, separated by a line of '* * *'.""" | |
1323 |
|
1323 | |||
1324 | q = repo.mq |
|
1324 | q = repo.mq | |
1325 |
|
1325 | |||
1326 | if not files: |
|
1326 | if not files: | |
1327 | raise util.Abort(_('qfold requires at least one patch name')) |
|
1327 | raise util.Abort(_('qfold requires at least one patch name')) | |
1328 | if not q.check_toppatch(repo): |
|
1328 | if not q.check_toppatch(repo): | |
1329 | raise util.Abort(_('No patches applied\n')) |
|
1329 | raise util.Abort(_('No patches applied\n')) | |
1330 |
|
1330 | |||
1331 | message = commands.logmessage(opts) |
|
1331 | message = commands.logmessage(opts) | |
1332 | if opts['edit']: |
|
1332 | if opts['edit']: | |
1333 | if message: |
|
1333 | if message: | |
1334 | raise util.Abort(_('option "-e" incompatible with "-m" or "-l"')) |
|
1334 | raise util.Abort(_('option "-e" incompatible with "-m" or "-l"')) | |
1335 |
|
1335 | |||
1336 | parent = q.lookup('qtip') |
|
1336 | parent = q.lookup('qtip') | |
1337 | patches = [] |
|
1337 | patches = [] | |
1338 | messages = [] |
|
1338 | messages = [] | |
1339 | for f in files: |
|
1339 | for f in files: | |
1340 | patch = q.lookup(f) |
|
1340 | patch = q.lookup(f) | |
1341 | if patch in patches or patch == parent: |
|
1341 | if patch in patches or patch == parent: | |
1342 | ui.warn(_('Skipping already folded patch %s') % patch) |
|
1342 | ui.warn(_('Skipping already folded patch %s') % patch) | |
1343 | if q.isapplied(patch): |
|
1343 | if q.isapplied(patch): | |
1344 | raise util.Abort(_('qfold cannot fold already applied patch %s') % patch) |
|
1344 | raise util.Abort(_('qfold cannot fold already applied patch %s') % patch) | |
1345 | patches.append(patch) |
|
1345 | patches.append(patch) | |
1346 |
|
1346 | |||
1347 | for patch in patches: |
|
1347 | for patch in patches: | |
1348 | if not message: |
|
1348 | if not message: | |
1349 | messages.append(q.readheaders(patch)[0]) |
|
1349 | messages.append(q.readheaders(patch)[0]) | |
1350 | pf = os.path.join(q.path, patch) |
|
1350 | pf = os.path.join(q.path, patch) | |
1351 | (patchsuccess, files, fuzz) = q.patch(repo, pf) |
|
1351 | (patchsuccess, files, fuzz) = q.patch(repo, pf) | |
1352 | if not patchsuccess: |
|
1352 | if not patchsuccess: | |
1353 | raise util.Abort(_('Error folding patch %s') % patch) |
|
1353 | raise util.Abort(_('Error folding patch %s') % patch) | |
1354 |
|
1354 | |||
1355 | if not message: |
|
1355 | if not message: | |
1356 | message, comments, user = q.readheaders(parent)[0:3] |
|
1356 | message, comments, user = q.readheaders(parent)[0:3] | |
1357 | for msg in messages: |
|
1357 | for msg in messages: | |
1358 | message.append('* * *') |
|
1358 | message.append('* * *') | |
1359 | message.extend(msg) |
|
1359 | message.extend(msg) | |
1360 | message = '\n'.join(message) |
|
1360 | message = '\n'.join(message) | |
1361 |
|
1361 | |||
1362 | if opts['edit']: |
|
1362 | if opts['edit']: | |
1363 | message = ui.edit(message, user or ui.username()) |
|
1363 | message = ui.edit(message, user or ui.username()) | |
1364 |
|
1364 | |||
1365 | q.refresh(repo, msg=message) |
|
1365 | q.refresh(repo, msg=message) | |
1366 |
|
1366 | |||
1367 | for patch in patches: |
|
1367 | for patch in patches: | |
1368 | q.delete(repo, patch, force=opts['force']) |
|
1368 | q.delete(repo, patch, force=opts['force']) | |
1369 |
|
1369 | |||
1370 | q.save_dirty() |
|
1370 | q.save_dirty() | |
1371 |
|
1371 | |||
1372 | def header(ui, repo, patch=None): |
|
1372 | def header(ui, repo, patch=None): | |
1373 | """Print the header of the topmost or specified patch""" |
|
1373 | """Print the header of the topmost or specified patch""" | |
1374 | q = repo.mq |
|
1374 | q = repo.mq | |
1375 |
|
1375 | |||
1376 | if patch: |
|
1376 | if patch: | |
1377 | patch = q.lookup(patch) |
|
1377 | patch = q.lookup(patch) | |
1378 | else: |
|
1378 | else: | |
1379 | if not q.applied: |
|
1379 | if not q.applied: | |
1380 | ui.write('No patches applied\n') |
|
1380 | ui.write('No patches applied\n') | |
1381 | return |
|
1381 | return | |
1382 | patch = q.lookup('qtip') |
|
1382 | patch = q.lookup('qtip') | |
1383 | message = repo.mq.readheaders(patch)[0] |
|
1383 | message = repo.mq.readheaders(patch)[0] | |
1384 |
|
1384 | |||
1385 | ui.write('\n'.join(message) + '\n') |
|
1385 | ui.write('\n'.join(message) + '\n') | |
1386 |
|
1386 | |||
1387 | def lastsavename(path): |
|
1387 | def lastsavename(path): | |
1388 | (directory, base) = os.path.split(path) |
|
1388 | (directory, base) = os.path.split(path) | |
1389 | names = os.listdir(directory) |
|
1389 | names = os.listdir(directory) | |
1390 | namere = re.compile("%s.([0-9]+)" % base) |
|
1390 | namere = re.compile("%s.([0-9]+)" % base) | |
1391 | maxindex = None |
|
1391 | maxindex = None | |
1392 | maxname = None |
|
1392 | maxname = None | |
1393 | for f in names: |
|
1393 | for f in names: | |
1394 | m = namere.match(f) |
|
1394 | m = namere.match(f) | |
1395 | if m: |
|
1395 | if m: | |
1396 | index = int(m.group(1)) |
|
1396 | index = int(m.group(1)) | |
1397 | if maxindex == None or index > maxindex: |
|
1397 | if maxindex == None or index > maxindex: | |
1398 | maxindex = index |
|
1398 | maxindex = index | |
1399 | maxname = f |
|
1399 | maxname = f | |
1400 | if maxname: |
|
1400 | if maxname: | |
1401 | return (os.path.join(directory, maxname), maxindex) |
|
1401 | return (os.path.join(directory, maxname), maxindex) | |
1402 | return (None, None) |
|
1402 | return (None, None) | |
1403 |
|
1403 | |||
1404 | def savename(path): |
|
1404 | def savename(path): | |
1405 | (last, index) = lastsavename(path) |
|
1405 | (last, index) = lastsavename(path) | |
1406 | if last is None: |
|
1406 | if last is None: | |
1407 | index = 0 |
|
1407 | index = 0 | |
1408 | newpath = path + ".%d" % (index + 1) |
|
1408 | newpath = path + ".%d" % (index + 1) | |
1409 | return newpath |
|
1409 | return newpath | |
1410 |
|
1410 | |||
1411 | def push(ui, repo, patch=None, **opts): |
|
1411 | def push(ui, repo, patch=None, **opts): | |
1412 | """push the next patch onto the stack""" |
|
1412 | """push the next patch onto the stack""" | |
1413 | q = repo.mq |
|
1413 | q = repo.mq | |
1414 | mergeq = None |
|
1414 | mergeq = None | |
1415 |
|
1415 | |||
1416 | if opts['all']: |
|
1416 | if opts['all']: | |
1417 | patch = q.series[-1] |
|
1417 | patch = q.series[-1] | |
1418 | if opts['merge']: |
|
1418 | if opts['merge']: | |
1419 | if opts['name']: |
|
1419 | if opts['name']: | |
1420 | newpath = opts['name'] |
|
1420 | newpath = opts['name'] | |
1421 | else: |
|
1421 | else: | |
1422 | newpath, i = lastsavename(q.path) |
|
1422 | newpath, i = lastsavename(q.path) | |
1423 | if not newpath: |
|
1423 | if not newpath: | |
1424 | ui.warn("no saved queues found, please use -n\n") |
|
1424 | ui.warn("no saved queues found, please use -n\n") | |
1425 | return 1 |
|
1425 | return 1 | |
1426 | mergeq = queue(ui, repo.join(""), newpath) |
|
1426 | mergeq = queue(ui, repo.join(""), newpath) | |
1427 | ui.warn("merging with queue at: %s\n" % mergeq.path) |
|
1427 | ui.warn("merging with queue at: %s\n" % mergeq.path) | |
1428 | ret = q.push(repo, patch, force=opts['force'], list=opts['list'], |
|
1428 | ret = q.push(repo, patch, force=opts['force'], list=opts['list'], | |
1429 | mergeq=mergeq) |
|
1429 | mergeq=mergeq) | |
1430 | q.save_dirty() |
|
1430 | q.save_dirty() | |
1431 | return ret |
|
1431 | return ret | |
1432 |
|
1432 | |||
1433 | def pop(ui, repo, patch=None, **opts): |
|
1433 | def pop(ui, repo, patch=None, **opts): | |
1434 | """pop the current patch off the stack""" |
|
1434 | """pop the current patch off the stack""" | |
1435 | localupdate = True |
|
1435 | localupdate = True | |
1436 | if opts['name']: |
|
1436 | if opts['name']: | |
1437 | q = queue(ui, repo.join(""), repo.join(opts['name'])) |
|
1437 | q = queue(ui, repo.join(""), repo.join(opts['name'])) | |
1438 | ui.warn('using patch queue: %s\n' % q.path) |
|
1438 | ui.warn('using patch queue: %s\n' % q.path) | |
1439 | localupdate = False |
|
1439 | localupdate = False | |
1440 | else: |
|
1440 | else: | |
1441 | q = repo.mq |
|
1441 | q = repo.mq | |
1442 | q.pop(repo, patch, force=opts['force'], update=localupdate, all=opts['all']) |
|
1442 | q.pop(repo, patch, force=opts['force'], update=localupdate, all=opts['all']) | |
1443 | q.save_dirty() |
|
1443 | q.save_dirty() | |
1444 | return 0 |
|
1444 | return 0 | |
1445 |
|
1445 | |||
1446 | def rename(ui, repo, patch, name=None, **opts): |
|
1446 | def rename(ui, repo, patch, name=None, **opts): | |
1447 | """rename a patch |
|
1447 | """rename a patch | |
1448 |
|
1448 | |||
1449 | With one argument, renames the current patch to PATCH1. |
|
1449 | With one argument, renames the current patch to PATCH1. | |
1450 | With two arguments, renames PATCH1 to PATCH2.""" |
|
1450 | With two arguments, renames PATCH1 to PATCH2.""" | |
1451 |
|
1451 | |||
1452 | q = repo.mq |
|
1452 | q = repo.mq | |
1453 |
|
1453 | |||
1454 | if not name: |
|
1454 | if not name: | |
1455 | name = patch |
|
1455 | name = patch | |
1456 | patch = None |
|
1456 | patch = None | |
1457 |
|
1457 | |||
1458 | if name in q.series: |
|
1458 | if name in q.series: | |
1459 | raise util.Abort(_('A patch named %s already exists in the series file') % name) |
|
1459 | raise util.Abort(_('A patch named %s already exists in the series file') % name) | |
1460 |
|
1460 | |||
1461 | absdest = os.path.join(q.path, name) |
|
1461 | absdest = os.path.join(q.path, name) | |
1462 | if os.path.exists(absdest): |
|
1462 | if os.path.exists(absdest): | |
1463 | raise util.Abort(_('%s already exists') % absdest) |
|
1463 | raise util.Abort(_('%s already exists') % absdest) | |
1464 |
|
1464 | |||
1465 | if patch: |
|
1465 | if patch: | |
1466 | patch = q.lookup(patch) |
|
1466 | patch = q.lookup(patch) | |
1467 | else: |
|
1467 | else: | |
1468 | if not q.applied: |
|
1468 | if not q.applied: | |
1469 | ui.write(_('No patches applied\n')) |
|
1469 | ui.write(_('No patches applied\n')) | |
1470 | return |
|
1470 | return | |
1471 | patch = q.lookup('qtip') |
|
1471 | patch = q.lookup('qtip') | |
1472 |
|
1472 | |||
1473 | if ui.verbose: |
|
1473 | if ui.verbose: | |
1474 | ui.write('Renaming %s to %s\n' % (patch, name)) |
|
1474 | ui.write('Renaming %s to %s\n' % (patch, name)) | |
1475 | i = q.find_series(patch) |
|
1475 | i = q.find_series(patch) | |
1476 | q.full_series[i] = name |
|
1476 | q.full_series[i] = name | |
1477 | q.parse_series() |
|
1477 | q.parse_series() | |
1478 | q.series_dirty = 1 |
|
1478 | q.series_dirty = 1 | |
1479 |
|
1479 | |||
1480 | info = q.isapplied(patch) |
|
1480 | info = q.isapplied(patch) | |
1481 | if info: |
|
1481 | if info: | |
1482 | q.applied[info[0]] = StatusEntry(info[1], name) |
|
1482 | q.applied[info[0]] = StatusEntry(info[1], name) | |
1483 | q.applied_dirty = 1 |
|
1483 | q.applied_dirty = 1 | |
1484 |
|
1484 | |||
1485 | util.rename(os.path.join(q.path, patch), absdest) |
|
1485 | util.rename(os.path.join(q.path, patch), absdest) | |
1486 | r = q.qrepo() |
|
1486 | r = q.qrepo() | |
1487 | if r: |
|
1487 | if r: | |
1488 | wlock = r.wlock() |
|
1488 | wlock = r.wlock() | |
1489 | if r.dirstate.state(name) == 'r': |
|
1489 | if r.dirstate.state(name) == 'r': | |
1490 | r.undelete([name], wlock) |
|
1490 | r.undelete([name], wlock) | |
1491 | r.copy(patch, name, wlock) |
|
1491 | r.copy(patch, name, wlock) | |
1492 | r.remove([patch], False, wlock) |
|
1492 | r.remove([patch], False, wlock) | |
1493 |
|
1493 | |||
1494 | q.save_dirty() |
|
1494 | q.save_dirty() | |
1495 |
|
1495 | |||
1496 | def restore(ui, repo, rev, **opts): |
|
1496 | def restore(ui, repo, rev, **opts): | |
1497 | """restore the queue state saved by a rev""" |
|
1497 | """restore the queue state saved by a rev""" | |
1498 | rev = repo.lookup(rev) |
|
1498 | rev = repo.lookup(rev) | |
1499 | q = repo.mq |
|
1499 | q = repo.mq | |
1500 | q.restore(repo, rev, delete=opts['delete'], |
|
1500 | q.restore(repo, rev, delete=opts['delete'], | |
1501 | qupdate=opts['update']) |
|
1501 | qupdate=opts['update']) | |
1502 | q.save_dirty() |
|
1502 | q.save_dirty() | |
1503 | return 0 |
|
1503 | return 0 | |
1504 |
|
1504 | |||
1505 | def save(ui, repo, **opts): |
|
1505 | def save(ui, repo, **opts): | |
1506 | """save current queue state""" |
|
1506 | """save current queue state""" | |
1507 | q = repo.mq |
|
1507 | q = repo.mq | |
1508 | message = commands.logmessage(opts) |
|
1508 | message = commands.logmessage(opts) | |
1509 | ret = q.save(repo, msg=message) |
|
1509 | ret = q.save(repo, msg=message) | |
1510 | if ret: |
|
1510 | if ret: | |
1511 | return ret |
|
1511 | return ret | |
1512 | q.save_dirty() |
|
1512 | q.save_dirty() | |
1513 | if opts['copy']: |
|
1513 | if opts['copy']: | |
1514 | path = q.path |
|
1514 | path = q.path | |
1515 | if opts['name']: |
|
1515 | if opts['name']: | |
1516 | newpath = os.path.join(q.basepath, opts['name']) |
|
1516 | newpath = os.path.join(q.basepath, opts['name']) | |
1517 | if os.path.exists(newpath): |
|
1517 | if os.path.exists(newpath): | |
1518 | if not os.path.isdir(newpath): |
|
1518 | if not os.path.isdir(newpath): | |
1519 | raise util.Abort(_('destination %s exists and is not ' |
|
1519 | raise util.Abort(_('destination %s exists and is not ' | |
1520 | 'a directory') % newpath) |
|
1520 | 'a directory') % newpath) | |
1521 | if not opts['force']: |
|
1521 | if not opts['force']: | |
1522 | raise util.Abort(_('destination %s exists, ' |
|
1522 | raise util.Abort(_('destination %s exists, ' | |
1523 | 'use -f to force') % newpath) |
|
1523 | 'use -f to force') % newpath) | |
1524 | else: |
|
1524 | else: | |
1525 | newpath = savename(path) |
|
1525 | newpath = savename(path) | |
1526 | ui.warn("copy %s to %s\n" % (path, newpath)) |
|
1526 | ui.warn("copy %s to %s\n" % (path, newpath)) | |
1527 | util.copyfiles(path, newpath) |
|
1527 | util.copyfiles(path, newpath) | |
1528 | if opts['empty']: |
|
1528 | if opts['empty']: | |
1529 | try: |
|
1529 | try: | |
1530 | os.unlink(os.path.join(q.path, q.status_path)) |
|
1530 | os.unlink(os.path.join(q.path, q.status_path)) | |
1531 | except: |
|
1531 | except: | |
1532 | pass |
|
1532 | pass | |
1533 | return 0 |
|
1533 | return 0 | |
1534 |
|
1534 | |||
1535 | def strip(ui, repo, rev, **opts): |
|
1535 | def strip(ui, repo, rev, **opts): | |
1536 | """strip a revision and all later revs on the same branch""" |
|
1536 | """strip a revision and all later revs on the same branch""" | |
1537 | rev = repo.lookup(rev) |
|
1537 | rev = repo.lookup(rev) | |
1538 | backup = 'all' |
|
1538 | backup = 'all' | |
1539 | if opts['backup']: |
|
1539 | if opts['backup']: | |
1540 | backup = 'strip' |
|
1540 | backup = 'strip' | |
1541 | elif opts['nobackup']: |
|
1541 | elif opts['nobackup']: | |
1542 | backup = 'none' |
|
1542 | backup = 'none' | |
1543 | repo.mq.strip(repo, rev, backup=backup) |
|
1543 | repo.mq.strip(repo, rev, backup=backup) | |
1544 | return 0 |
|
1544 | return 0 | |
1545 |
|
1545 | |||
1546 | def version(ui, q=None): |
|
1546 | def version(ui, q=None): | |
1547 | """print the version number of the mq extension""" |
|
1547 | """print the version number of the mq extension""" | |
1548 | ui.write("mq version %s\n" % versionstr) |
|
1548 | ui.write("mq version %s\n" % versionstr) | |
1549 | return 0 |
|
1549 | return 0 | |
1550 |
|
1550 | |||
1551 | def reposetup(ui, repo): |
|
1551 | def reposetup(ui, repo): | |
1552 | class MqRepo(repo.__class__): |
|
1552 | class MqRepo(repo.__class__): | |
1553 | def tags(self): |
|
1553 | def tags(self): | |
1554 | if self.tagscache: |
|
1554 | if self.tagscache: | |
1555 | return self.tagscache |
|
1555 | return self.tagscache | |
1556 |
|
1556 | |||
1557 | tagscache = super(MqRepo, self).tags() |
|
1557 | tagscache = super(MqRepo, self).tags() | |
1558 |
|
1558 | |||
1559 | q = self.mq |
|
1559 | q = self.mq | |
1560 | if not q.applied: |
|
1560 | if not q.applied: | |
1561 | return tagscache |
|
1561 | return tagscache | |
1562 |
|
1562 | |||
1563 | mqtags = [(patch.rev, patch.name) for patch in q.applied] |
|
1563 | mqtags = [(patch.rev, patch.name) for patch in q.applied] | |
1564 | mqtags.append((mqtags[-1][0], 'qtip')) |
|
1564 | mqtags.append((mqtags[-1][0], 'qtip')) | |
1565 | mqtags.append((mqtags[0][0], 'qbase')) |
|
1565 | mqtags.append((mqtags[0][0], 'qbase')) | |
1566 | for patch in mqtags: |
|
1566 | for patch in mqtags: | |
1567 | if patch[1] in tagscache: |
|
1567 | if patch[1] in tagscache: | |
1568 | self.ui.warn('Tag %s overrides mq patch of the same name\n' % patch[1]) |
|
1568 | self.ui.warn('Tag %s overrides mq patch of the same name\n' % patch[1]) | |
1569 | else: |
|
1569 | else: | |
1570 | tagscache[patch[1]] = revlog.bin(patch[0]) |
|
1570 | tagscache[patch[1]] = revlog.bin(patch[0]) | |
1571 |
|
1571 | |||
1572 | return tagscache |
|
1572 | return tagscache | |
1573 |
|
1573 | |||
1574 | repo.__class__ = MqRepo |
|
1574 | repo.__class__ = MqRepo | |
1575 | repo.mq = queue(ui, repo.join("")) |
|
1575 | repo.mq = queue(ui, repo.join("")) | |
1576 |
|
1576 | |||
1577 | cmdtable = { |
|
1577 | cmdtable = { | |
1578 | "qapplied": (applied, [], 'hg qapplied [PATCH]'), |
|
1578 | "qapplied": (applied, [], 'hg qapplied [PATCH]'), | |
1579 | "qclone": (clone, |
|
1579 | "qclone": (clone, | |
1580 | [('', 'pull', None, _('use pull protocol to copy metadata')), |
|
1580 | [('', 'pull', None, _('use pull protocol to copy metadata')), | |
1581 | ('U', 'noupdate', None, _('do not update the new working directories')), |
|
1581 | ('U', 'noupdate', None, _('do not update the new working directories')), | |
1582 | ('', 'uncompressed', None, |
|
1582 | ('', 'uncompressed', None, | |
1583 | _('use uncompressed transfer (fast over LAN)')), |
|
1583 | _('use uncompressed transfer (fast over LAN)')), | |
1584 | ('e', 'ssh', '', _('specify ssh command to use')), |
|
1584 | ('e', 'ssh', '', _('specify ssh command to use')), | |
1585 | ('p', 'patches', '', _('location of source patch repo')), |
|
1585 | ('p', 'patches', '', _('location of source patch repo')), | |
1586 | ('', 'remotecmd', '', |
|
1586 | ('', 'remotecmd', '', | |
1587 | _('specify hg command to run on the remote side'))], |
|
1587 | _('specify hg command to run on the remote side'))], | |
1588 | 'hg qclone [OPTION]... SOURCE [DEST]'), |
|
1588 | 'hg qclone [OPTION]... SOURCE [DEST]'), | |
1589 | "qcommit|qci": |
|
1589 | "qcommit|qci": | |
1590 | (commit, |
|
1590 | (commit, | |
1591 | commands.table["^commit|ci"][1], |
|
1591 | commands.table["^commit|ci"][1], | |
1592 | 'hg qcommit [OPTION]... [FILE]...'), |
|
1592 | 'hg qcommit [OPTION]... [FILE]...'), | |
1593 | "^qdiff": (diff, [], 'hg qdiff [FILE]...'), |
|
1593 | "^qdiff": (diff, [], 'hg qdiff [FILE]...'), | |
1594 | "qdelete": |
|
1594 | "qdelete": | |
1595 | (delete, |
|
1595 | (delete, | |
1596 | [('f', 'force', None, _('delete patch file'))], |
|
1596 | [('f', 'force', None, _('delete patch file'))], | |
1597 | 'hg qdelete [-f] PATCH'), |
|
1597 | 'hg qdelete [-f] PATCH'), | |
1598 | 'qfold': |
|
1598 | 'qfold': | |
1599 | (fold, |
|
1599 | (fold, | |
1600 | [('e', 'edit', None, _('edit patch header')), |
|
1600 | [('e', 'edit', None, _('edit patch header')), | |
1601 | ('f', 'force', None, _('delete folded patch files')), |
|
1601 | ('f', 'force', None, _('delete folded patch files')), | |
1602 | ('m', 'message', '', _('set patch header to <text>')), |
|
1602 | ('m', 'message', '', _('set patch header to <text>')), | |
1603 | ('l', 'logfile', '', _('set patch header to contents of <file>'))], |
|
1603 | ('l', 'logfile', '', _('set patch header to contents of <file>'))], | |
1604 | 'hg qfold [-e] [-m <text>] [-l <file] PATCH...'), |
|
1604 | 'hg qfold [-e] [-m <text>] [-l <file] PATCH...'), | |
1605 | 'qheader': (header, [], |
|
1605 | 'qheader': (header, [], | |
1606 | _('hg qheader [PATCH]')), |
|
1606 | _('hg qheader [PATCH]')), | |
1607 | "^qimport": |
|
1607 | "^qimport": | |
1608 | (qimport, |
|
1608 | (qimport, | |
1609 | [('e', 'existing', None, 'import file in patch dir'), |
|
1609 | [('e', 'existing', None, 'import file in patch dir'), | |
1610 | ('n', 'name', '', 'patch file name'), |
|
1610 | ('n', 'name', '', 'patch file name'), | |
1611 | ('f', 'force', None, 'overwrite existing files')], |
|
1611 | ('f', 'force', None, 'overwrite existing files')], | |
1612 | 'hg qimport [-e] [-n NAME] [-f] FILE...'), |
|
1612 | 'hg qimport [-e] [-n NAME] [-f] FILE...'), | |
1613 | "^qinit": |
|
1613 | "^qinit": | |
1614 | (init, |
|
1614 | (init, | |
1615 | [('c', 'create-repo', None, 'create queue repository')], |
|
1615 | [('c', 'create-repo', None, 'create queue repository')], | |
1616 | 'hg qinit [-c]'), |
|
1616 | 'hg qinit [-c]'), | |
1617 | "qnew": |
|
1617 | "qnew": | |
1618 | (new, |
|
1618 | (new, | |
1619 | [('m', 'message', '', _('use <text> as commit message')), |
|
1619 | [('m', 'message', '', _('use <text> as commit message')), | |
1620 | ('l', 'logfile', '', _('read the commit message from <file>')), |
|
1620 | ('l', 'logfile', '', _('read the commit message from <file>')), | |
1621 | ('f', 'force', None, _('import uncommitted changes into patch'))], |
|
1621 | ('f', 'force', None, _('import uncommitted changes into patch'))], | |
1622 | 'hg qnew [-m TEXT] [-l FILE] [-f] PATCH'), |
|
1622 | 'hg qnew [-m TEXT] [-l FILE] [-f] PATCH'), | |
1623 | "qnext": (next, [], 'hg qnext'), |
|
1623 | "qnext": (next, [], 'hg qnext'), | |
1624 | "qprev": (prev, [], 'hg qprev'), |
|
1624 | "qprev": (prev, [], 'hg qprev'), | |
1625 | "^qpop": |
|
1625 | "^qpop": | |
1626 | (pop, |
|
1626 | (pop, | |
1627 | [('a', 'all', None, 'pop all patches'), |
|
1627 | [('a', 'all', None, 'pop all patches'), | |
1628 | ('n', 'name', '', 'queue name to pop'), |
|
1628 | ('n', 'name', '', 'queue name to pop'), | |
1629 | ('f', 'force', None, 'forget any local changes')], |
|
1629 | ('f', 'force', None, 'forget any local changes')], | |
1630 | 'hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]'), |
|
1630 | 'hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]'), | |
1631 | "^qpush": |
|
1631 | "^qpush": | |
1632 | (push, |
|
1632 | (push, | |
1633 | [('f', 'force', None, 'apply if the patch has rejects'), |
|
1633 | [('f', 'force', None, 'apply if the patch has rejects'), | |
1634 | ('l', 'list', None, 'list patch name in commit text'), |
|
1634 | ('l', 'list', None, 'list patch name in commit text'), | |
1635 | ('a', 'all', None, 'apply all patches'), |
|
1635 | ('a', 'all', None, 'apply all patches'), | |
1636 | ('m', 'merge', None, 'merge from another queue'), |
|
1636 | ('m', 'merge', None, 'merge from another queue'), | |
1637 | ('n', 'name', '', 'merge queue name')], |
|
1637 | ('n', 'name', '', 'merge queue name')], | |
1638 | 'hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]'), |
|
1638 | 'hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]'), | |
1639 | "^qrefresh": |
|
1639 | "^qrefresh": | |
1640 | (refresh, |
|
1640 | (refresh, | |
1641 | [('e', 'edit', None, _('edit commit message')), |
|
1641 | [('e', 'edit', None, _('edit commit message')), | |
1642 | ('m', 'message', '', _('change commit message with <text>')), |
|
1642 | ('m', 'message', '', _('change commit message with <text>')), | |
1643 | ('l', 'logfile', '', _('change commit message with <file> content')), |
|
1643 | ('l', 'logfile', '', _('change commit message with <file> content')), | |
1644 | ('s', 'short', None, 'short refresh')], |
|
1644 | ('s', 'short', None, 'short refresh')], | |
1645 | 'hg qrefresh [-e] [-m TEXT] [-l FILE] [-s]'), |
|
1645 | 'hg qrefresh [-e] [-m TEXT] [-l FILE] [-s]'), | |
1646 | 'qrename|qmv': |
|
1646 | 'qrename|qmv': | |
1647 | (rename, [], 'hg qrename PATCH1 [PATCH2]'), |
|
1647 | (rename, [], 'hg qrename PATCH1 [PATCH2]'), | |
1648 | "qrestore": |
|
1648 | "qrestore": | |
1649 | (restore, |
|
1649 | (restore, | |
1650 | [('d', 'delete', None, 'delete save entry'), |
|
1650 | [('d', 'delete', None, 'delete save entry'), | |
1651 | ('u', 'update', None, 'update queue working dir')], |
|
1651 | ('u', 'update', None, 'update queue working dir')], | |
1652 | 'hg qrestore [-d] [-u] REV'), |
|
1652 | 'hg qrestore [-d] [-u] REV'), | |
1653 | "qsave": |
|
1653 | "qsave": | |
1654 | (save, |
|
1654 | (save, | |
1655 | [('m', 'message', '', _('use <text> as commit message')), |
|
1655 | [('m', 'message', '', _('use <text> as commit message')), | |
1656 | ('l', 'logfile', '', _('read the commit message from <file>')), |
|
1656 | ('l', 'logfile', '', _('read the commit message from <file>')), | |
1657 | ('c', 'copy', None, 'copy patch directory'), |
|
1657 | ('c', 'copy', None, 'copy patch directory'), | |
1658 | ('n', 'name', '', 'copy directory name'), |
|
1658 | ('n', 'name', '', 'copy directory name'), | |
1659 | ('e', 'empty', None, 'clear queue status file'), |
|
1659 | ('e', 'empty', None, 'clear queue status file'), | |
1660 | ('f', 'force', None, 'force copy')], |
|
1660 | ('f', 'force', None, 'force copy')], | |
1661 | 'hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]'), |
|
1661 | 'hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]'), | |
1662 | "qseries": |
|
1662 | "qseries": | |
1663 | (series, |
|
1663 | (series, | |
1664 | [('m', 'missing', None, 'print patches not in series'), |
|
1664 | [('m', 'missing', None, 'print patches not in series'), | |
1665 | ('s', 'summary', None, _('print first line of patch header'))], |
|
1665 | ('s', 'summary', None, _('print first line of patch header'))], | |
1666 | 'hg qseries [-m]'), |
|
1666 | 'hg qseries [-m]'), | |
1667 | "^strip": |
|
1667 | "^strip": | |
1668 | (strip, |
|
1668 | (strip, | |
1669 | [('f', 'force', None, 'force multi-head removal'), |
|
1669 | [('f', 'force', None, 'force multi-head removal'), | |
1670 | ('b', 'backup', None, 'bundle unrelated changesets'), |
|
1670 | ('b', 'backup', None, 'bundle unrelated changesets'), | |
1671 | ('n', 'nobackup', None, 'no backups')], |
|
1671 | ('n', 'nobackup', None, 'no backups')], | |
1672 | 'hg strip [-f] [-b] [-n] REV'), |
|
1672 | 'hg strip [-f] [-b] [-n] REV'), | |
1673 | "qtop": (top, [], 'hg qtop'), |
|
1673 | "qtop": (top, [], 'hg qtop'), | |
1674 | "qunapplied": (unapplied, [], 'hg qunapplied [PATCH]'), |
|
1674 | "qunapplied": (unapplied, [], 'hg qunapplied [PATCH]'), | |
1675 | "qversion": (version, [], 'hg qversion') |
|
1675 | "qversion": (version, [], 'hg qversion') | |
1676 | } |
|
1676 | } | |
1677 |
|
1677 |
@@ -1,3683 +1,3686 b'' | |||||
1 | # commands.py - command processing for mercurial |
|
1 | # commands.py - command processing for mercurial | |
2 | # |
|
2 | # | |
3 | # Copyright 2005 Matt Mackall <mpm@selenic.com> |
|
3 | # Copyright 2005 Matt Mackall <mpm@selenic.com> | |
4 | # |
|
4 | # | |
5 | # This software may be used and distributed according to the terms |
|
5 | # This software may be used and distributed according to the terms | |
6 | # of the GNU General Public License, incorporated herein by reference. |
|
6 | # of the GNU General Public License, incorporated herein by reference. | |
7 |
|
7 | |||
8 | from demandload import demandload |
|
8 | from demandload import demandload | |
9 | from node import * |
|
9 | from node import * | |
10 | from i18n import gettext as _ |
|
10 | from i18n import gettext as _ | |
11 | demandload(globals(), "os re sys signal shutil imp urllib pdb") |
|
11 | demandload(globals(), "os re sys signal shutil imp urllib pdb") | |
12 | demandload(globals(), "fancyopts ui hg util lock revlog templater bundlerepo") |
|
12 | demandload(globals(), "fancyopts ui hg util lock revlog templater bundlerepo") | |
13 | demandload(globals(), "fnmatch mdiff random signal tempfile time") |
|
13 | demandload(globals(), "fnmatch mdiff random signal tempfile time") | |
14 | demandload(globals(), "traceback errno socket version struct atexit sets bz2") |
|
14 | demandload(globals(), "traceback errno socket version struct atexit sets bz2") | |
15 | demandload(globals(), "archival cStringIO changegroup email.Parser") |
|
15 | demandload(globals(), "archival cStringIO changegroup email.Parser") | |
16 | demandload(globals(), "hgweb.server sshserver") |
|
16 | demandload(globals(), "hgweb.server sshserver") | |
17 |
|
17 | |||
18 | class UnknownCommand(Exception): |
|
18 | class UnknownCommand(Exception): | |
19 | """Exception raised if command is not in the command table.""" |
|
19 | """Exception raised if command is not in the command table.""" | |
20 | class AmbiguousCommand(Exception): |
|
20 | class AmbiguousCommand(Exception): | |
21 | """Exception raised if command shortcut matches more than one command.""" |
|
21 | """Exception raised if command shortcut matches more than one command.""" | |
22 |
|
22 | |||
23 | def bail_if_changed(repo): |
|
23 | def bail_if_changed(repo): | |
24 | modified, added, removed, deleted, unknown = repo.changes() |
|
24 | modified, added, removed, deleted, unknown = repo.changes() | |
25 | if modified or added or removed or deleted: |
|
25 | if modified or added or removed or deleted: | |
26 | raise util.Abort(_("outstanding uncommitted changes")) |
|
26 | raise util.Abort(_("outstanding uncommitted changes")) | |
27 |
|
27 | |||
28 | def filterfiles(filters, files): |
|
28 | def filterfiles(filters, files): | |
29 | l = [x for x in files if x in filters] |
|
29 | l = [x for x in files if x in filters] | |
30 |
|
30 | |||
31 | for t in filters: |
|
31 | for t in filters: | |
32 | if t and t[-1] != "/": |
|
32 | if t and t[-1] != "/": | |
33 | t += "/" |
|
33 | t += "/" | |
34 | l += [x for x in files if x.startswith(t)] |
|
34 | l += [x for x in files if x.startswith(t)] | |
35 | return l |
|
35 | return l | |
36 |
|
36 | |||
37 | def relpath(repo, args): |
|
37 | def relpath(repo, args): | |
38 | cwd = repo.getcwd() |
|
38 | cwd = repo.getcwd() | |
39 | if cwd: |
|
39 | if cwd: | |
40 | return [util.normpath(os.path.join(cwd, x)) for x in args] |
|
40 | return [util.normpath(os.path.join(cwd, x)) for x in args] | |
41 | return args |
|
41 | return args | |
42 |
|
42 | |||
43 | def logmessage(opts): |
|
43 | def logmessage(opts): | |
44 | """ get the log message according to -m and -l option """ |
|
44 | """ get the log message according to -m and -l option """ | |
45 | message = opts['message'] |
|
45 | message = opts['message'] | |
46 | logfile = opts['logfile'] |
|
46 | logfile = opts['logfile'] | |
47 |
|
47 | |||
48 | if message and logfile: |
|
48 | if message and logfile: | |
49 | raise util.Abort(_('options --message and --logfile are mutually ' |
|
49 | raise util.Abort(_('options --message and --logfile are mutually ' | |
50 | 'exclusive')) |
|
50 | 'exclusive')) | |
51 | if not message and logfile: |
|
51 | if not message and logfile: | |
52 | try: |
|
52 | try: | |
53 | if logfile == '-': |
|
53 | if logfile == '-': | |
54 | message = sys.stdin.read() |
|
54 | message = sys.stdin.read() | |
55 | else: |
|
55 | else: | |
56 | message = open(logfile).read() |
|
56 | message = open(logfile).read() | |
57 | except IOError, inst: |
|
57 | except IOError, inst: | |
58 | raise util.Abort(_("can't read commit message '%s': %s") % |
|
58 | raise util.Abort(_("can't read commit message '%s': %s") % | |
59 | (logfile, inst.strerror)) |
|
59 | (logfile, inst.strerror)) | |
60 | return message |
|
60 | return message | |
61 |
|
61 | |||
62 | def matchpats(repo, pats=[], opts={}, head=''): |
|
62 | def matchpats(repo, pats=[], opts={}, head=''): | |
63 | cwd = repo.getcwd() |
|
63 | cwd = repo.getcwd() | |
64 | if not pats and cwd: |
|
64 | if not pats and cwd: | |
65 | opts['include'] = [os.path.join(cwd, i) for i in opts['include']] |
|
65 | opts['include'] = [os.path.join(cwd, i) for i in opts['include']] | |
66 | opts['exclude'] = [os.path.join(cwd, x) for x in opts['exclude']] |
|
66 | opts['exclude'] = [os.path.join(cwd, x) for x in opts['exclude']] | |
67 | cwd = '' |
|
67 | cwd = '' | |
68 | return util.cmdmatcher(repo.root, cwd, pats or ['.'], opts.get('include'), |
|
68 | return util.cmdmatcher(repo.root, cwd, pats or ['.'], opts.get('include'), | |
69 | opts.get('exclude'), head) |
|
69 | opts.get('exclude'), head) | |
70 |
|
70 | |||
71 | def makewalk(repo, pats, opts, node=None, head='', badmatch=None): |
|
71 | def makewalk(repo, pats, opts, node=None, head='', badmatch=None): | |
72 | files, matchfn, anypats = matchpats(repo, pats, opts, head) |
|
72 | files, matchfn, anypats = matchpats(repo, pats, opts, head) | |
73 | exact = dict(zip(files, files)) |
|
73 | exact = dict(zip(files, files)) | |
74 | def walk(): |
|
74 | def walk(): | |
75 | for src, fn in repo.walk(node=node, files=files, match=matchfn, |
|
75 | for src, fn in repo.walk(node=node, files=files, match=matchfn, | |
76 | badmatch=badmatch): |
|
76 | badmatch=badmatch): | |
77 | yield src, fn, util.pathto(repo.getcwd(), fn), fn in exact |
|
77 | yield src, fn, util.pathto(repo.getcwd(), fn), fn in exact | |
78 | return files, matchfn, walk() |
|
78 | return files, matchfn, walk() | |
79 |
|
79 | |||
80 | def walk(repo, pats, opts, node=None, head='', badmatch=None): |
|
80 | def walk(repo, pats, opts, node=None, head='', badmatch=None): | |
81 | files, matchfn, results = makewalk(repo, pats, opts, node, head, badmatch) |
|
81 | files, matchfn, results = makewalk(repo, pats, opts, node, head, badmatch) | |
82 | for r in results: |
|
82 | for r in results: | |
83 | yield r |
|
83 | yield r | |
84 |
|
84 | |||
85 | def walkchangerevs(ui, repo, pats, opts): |
|
85 | def walkchangerevs(ui, repo, pats, opts): | |
86 | '''Iterate over files and the revs they changed in. |
|
86 | '''Iterate over files and the revs they changed in. | |
87 |
|
87 | |||
88 | Callers most commonly need to iterate backwards over the history |
|
88 | Callers most commonly need to iterate backwards over the history | |
89 | it is interested in. Doing so has awful (quadratic-looking) |
|
89 | it is interested in. Doing so has awful (quadratic-looking) | |
90 | performance, so we use iterators in a "windowed" way. |
|
90 | performance, so we use iterators in a "windowed" way. | |
91 |
|
91 | |||
92 | We walk a window of revisions in the desired order. Within the |
|
92 | We walk a window of revisions in the desired order. Within the | |
93 | window, we first walk forwards to gather data, then in the desired |
|
93 | window, we first walk forwards to gather data, then in the desired | |
94 | order (usually backwards) to display it. |
|
94 | order (usually backwards) to display it. | |
95 |
|
95 | |||
96 | This function returns an (iterator, getchange, matchfn) tuple. The |
|
96 | This function returns an (iterator, getchange, matchfn) tuple. The | |
97 | getchange function returns the changelog entry for a numeric |
|
97 | getchange function returns the changelog entry for a numeric | |
98 | revision. The iterator yields 3-tuples. They will be of one of |
|
98 | revision. The iterator yields 3-tuples. They will be of one of | |
99 | the following forms: |
|
99 | the following forms: | |
100 |
|
100 | |||
101 | "window", incrementing, lastrev: stepping through a window, |
|
101 | "window", incrementing, lastrev: stepping through a window, | |
102 | positive if walking forwards through revs, last rev in the |
|
102 | positive if walking forwards through revs, last rev in the | |
103 | sequence iterated over - use to reset state for the current window |
|
103 | sequence iterated over - use to reset state for the current window | |
104 |
|
104 | |||
105 | "add", rev, fns: out-of-order traversal of the given file names |
|
105 | "add", rev, fns: out-of-order traversal of the given file names | |
106 | fns, which changed during revision rev - use to gather data for |
|
106 | fns, which changed during revision rev - use to gather data for | |
107 | possible display |
|
107 | possible display | |
108 |
|
108 | |||
109 | "iter", rev, None: in-order traversal of the revs earlier iterated |
|
109 | "iter", rev, None: in-order traversal of the revs earlier iterated | |
110 | over with "add" - use to display data''' |
|
110 | over with "add" - use to display data''' | |
111 |
|
111 | |||
112 | def increasing_windows(start, end, windowsize=8, sizelimit=512): |
|
112 | def increasing_windows(start, end, windowsize=8, sizelimit=512): | |
113 | if start < end: |
|
113 | if start < end: | |
114 | while start < end: |
|
114 | while start < end: | |
115 | yield start, min(windowsize, end-start) |
|
115 | yield start, min(windowsize, end-start) | |
116 | start += windowsize |
|
116 | start += windowsize | |
117 | if windowsize < sizelimit: |
|
117 | if windowsize < sizelimit: | |
118 | windowsize *= 2 |
|
118 | windowsize *= 2 | |
119 | else: |
|
119 | else: | |
120 | while start > end: |
|
120 | while start > end: | |
121 | yield start, min(windowsize, start-end-1) |
|
121 | yield start, min(windowsize, start-end-1) | |
122 | start -= windowsize |
|
122 | start -= windowsize | |
123 | if windowsize < sizelimit: |
|
123 | if windowsize < sizelimit: | |
124 | windowsize *= 2 |
|
124 | windowsize *= 2 | |
125 |
|
125 | |||
126 |
|
126 | |||
127 | files, matchfn, anypats = matchpats(repo, pats, opts) |
|
127 | files, matchfn, anypats = matchpats(repo, pats, opts) | |
128 | follow = opts.get('follow') or opts.get('follow_first') |
|
128 | follow = opts.get('follow') or opts.get('follow_first') | |
129 |
|
129 | |||
130 | if repo.changelog.count() == 0: |
|
130 | if repo.changelog.count() == 0: | |
131 | return [], False, matchfn |
|
131 | return [], False, matchfn | |
132 |
|
132 | |||
133 | if follow: |
|
133 | if follow: | |
134 | p = repo.dirstate.parents()[0] |
|
134 | p = repo.dirstate.parents()[0] | |
135 | if p == nullid: |
|
135 | if p == nullid: | |
136 | ui.warn(_('No working directory revision; defaulting to tip\n')) |
|
136 | ui.warn(_('No working directory revision; defaulting to tip\n')) | |
137 | start = 'tip' |
|
137 | start = 'tip' | |
138 | else: |
|
138 | else: | |
139 | start = repo.changelog.rev(p) |
|
139 | start = repo.changelog.rev(p) | |
140 | defrange = '%s:0' % start |
|
140 | defrange = '%s:0' % start | |
141 | else: |
|
141 | else: | |
142 | defrange = 'tip:0' |
|
142 | defrange = 'tip:0' | |
143 | revs = map(int, revrange(ui, repo, opts['rev'] or [defrange])) |
|
143 | revs = map(int, revrange(ui, repo, opts['rev'] or [defrange])) | |
144 | wanted = {} |
|
144 | wanted = {} | |
145 | slowpath = anypats |
|
145 | slowpath = anypats | |
146 | fncache = {} |
|
146 | fncache = {} | |
147 |
|
147 | |||
148 | chcache = {} |
|
148 | chcache = {} | |
149 | def getchange(rev): |
|
149 | def getchange(rev): | |
150 | ch = chcache.get(rev) |
|
150 | ch = chcache.get(rev) | |
151 | if ch is None: |
|
151 | if ch is None: | |
152 | chcache[rev] = ch = repo.changelog.read(repo.lookup(str(rev))) |
|
152 | chcache[rev] = ch = repo.changelog.read(repo.lookup(str(rev))) | |
153 | return ch |
|
153 | return ch | |
154 |
|
154 | |||
155 | if not slowpath and not files: |
|
155 | if not slowpath and not files: | |
156 | # No files, no patterns. Display all revs. |
|
156 | # No files, no patterns. Display all revs. | |
157 | wanted = dict(zip(revs, revs)) |
|
157 | wanted = dict(zip(revs, revs)) | |
158 | copies = [] |
|
158 | copies = [] | |
159 | if not slowpath: |
|
159 | if not slowpath: | |
160 | # Only files, no patterns. Check the history of each file. |
|
160 | # Only files, no patterns. Check the history of each file. | |
161 | def filerevgen(filelog, node): |
|
161 | def filerevgen(filelog, node): | |
162 | cl_count = repo.changelog.count() |
|
162 | cl_count = repo.changelog.count() | |
163 | if node is None: |
|
163 | if node is None: | |
164 | last = filelog.count() - 1 |
|
164 | last = filelog.count() - 1 | |
165 | else: |
|
165 | else: | |
166 | last = filelog.rev(node) |
|
166 | last = filelog.rev(node) | |
167 | for i, window in increasing_windows(last, -1): |
|
167 | for i, window in increasing_windows(last, -1): | |
168 | revs = [] |
|
168 | revs = [] | |
169 | for j in xrange(i - window, i + 1): |
|
169 | for j in xrange(i - window, i + 1): | |
170 | n = filelog.node(j) |
|
170 | n = filelog.node(j) | |
171 | revs.append((filelog.linkrev(n), |
|
171 | revs.append((filelog.linkrev(n), | |
172 | follow and filelog.renamed(n))) |
|
172 | follow and filelog.renamed(n))) | |
173 | revs.reverse() |
|
173 | revs.reverse() | |
174 | for rev in revs: |
|
174 | for rev in revs: | |
175 | # only yield rev for which we have the changelog, it can |
|
175 | # only yield rev for which we have the changelog, it can | |
176 | # happen while doing "hg log" during a pull or commit |
|
176 | # happen while doing "hg log" during a pull or commit | |
177 | if rev[0] < cl_count: |
|
177 | if rev[0] < cl_count: | |
178 | yield rev |
|
178 | yield rev | |
179 | def iterfiles(): |
|
179 | def iterfiles(): | |
180 | for filename in files: |
|
180 | for filename in files: | |
181 | yield filename, None |
|
181 | yield filename, None | |
182 | for filename_node in copies: |
|
182 | for filename_node in copies: | |
183 | yield filename_node |
|
183 | yield filename_node | |
184 | minrev, maxrev = min(revs), max(revs) |
|
184 | minrev, maxrev = min(revs), max(revs) | |
185 | for file_, node in iterfiles(): |
|
185 | for file_, node in iterfiles(): | |
186 | filelog = repo.file(file_) |
|
186 | filelog = repo.file(file_) | |
187 | # A zero count may be a directory or deleted file, so |
|
187 | # A zero count may be a directory or deleted file, so | |
188 | # try to find matching entries on the slow path. |
|
188 | # try to find matching entries on the slow path. | |
189 | if filelog.count() == 0: |
|
189 | if filelog.count() == 0: | |
190 | slowpath = True |
|
190 | slowpath = True | |
191 | break |
|
191 | break | |
192 | for rev, copied in filerevgen(filelog, node): |
|
192 | for rev, copied in filerevgen(filelog, node): | |
193 | if rev <= maxrev: |
|
193 | if rev <= maxrev: | |
194 | if rev < minrev: |
|
194 | if rev < minrev: | |
195 | break |
|
195 | break | |
196 | fncache.setdefault(rev, []) |
|
196 | fncache.setdefault(rev, []) | |
197 | fncache[rev].append(file_) |
|
197 | fncache[rev].append(file_) | |
198 | wanted[rev] = 1 |
|
198 | wanted[rev] = 1 | |
199 | if follow and copied: |
|
199 | if follow and copied: | |
200 | copies.append(copied) |
|
200 | copies.append(copied) | |
201 | if slowpath: |
|
201 | if slowpath: | |
202 | if follow: |
|
202 | if follow: | |
203 | raise util.Abort(_('can only follow copies/renames for explicit ' |
|
203 | raise util.Abort(_('can only follow copies/renames for explicit ' | |
204 | 'file names')) |
|
204 | 'file names')) | |
205 |
|
205 | |||
206 | # The slow path checks files modified in every changeset. |
|
206 | # The slow path checks files modified in every changeset. | |
207 | def changerevgen(): |
|
207 | def changerevgen(): | |
208 | for i, window in increasing_windows(repo.changelog.count()-1, -1): |
|
208 | for i, window in increasing_windows(repo.changelog.count()-1, -1): | |
209 | for j in xrange(i - window, i + 1): |
|
209 | for j in xrange(i - window, i + 1): | |
210 | yield j, getchange(j)[3] |
|
210 | yield j, getchange(j)[3] | |
211 |
|
211 | |||
212 | for rev, changefiles in changerevgen(): |
|
212 | for rev, changefiles in changerevgen(): | |
213 | matches = filter(matchfn, changefiles) |
|
213 | matches = filter(matchfn, changefiles) | |
214 | if matches: |
|
214 | if matches: | |
215 | fncache[rev] = matches |
|
215 | fncache[rev] = matches | |
216 | wanted[rev] = 1 |
|
216 | wanted[rev] = 1 | |
217 |
|
217 | |||
218 | def iterate(): |
|
218 | def iterate(): | |
219 | class followfilter: |
|
219 | class followfilter: | |
220 | def __init__(self, onlyfirst=False): |
|
220 | def __init__(self, onlyfirst=False): | |
221 | self.startrev = -1 |
|
221 | self.startrev = -1 | |
222 | self.roots = [] |
|
222 | self.roots = [] | |
223 | self.onlyfirst = onlyfirst |
|
223 | self.onlyfirst = onlyfirst | |
224 |
|
224 | |||
225 | def match(self, rev): |
|
225 | def match(self, rev): | |
226 | def realparents(rev): |
|
226 | def realparents(rev): | |
227 | if self.onlyfirst: |
|
227 | if self.onlyfirst: | |
228 | return repo.changelog.parentrevs(rev)[0:1] |
|
228 | return repo.changelog.parentrevs(rev)[0:1] | |
229 | else: |
|
229 | else: | |
230 | return filter(lambda x: x != -1, repo.changelog.parentrevs(rev)) |
|
230 | return filter(lambda x: x != -1, repo.changelog.parentrevs(rev)) | |
231 |
|
231 | |||
232 | if self.startrev == -1: |
|
232 | if self.startrev == -1: | |
233 | self.startrev = rev |
|
233 | self.startrev = rev | |
234 | return True |
|
234 | return True | |
235 |
|
235 | |||
236 | if rev > self.startrev: |
|
236 | if rev > self.startrev: | |
237 | # forward: all descendants |
|
237 | # forward: all descendants | |
238 | if not self.roots: |
|
238 | if not self.roots: | |
239 | self.roots.append(self.startrev) |
|
239 | self.roots.append(self.startrev) | |
240 | for parent in realparents(rev): |
|
240 | for parent in realparents(rev): | |
241 | if parent in self.roots: |
|
241 | if parent in self.roots: | |
242 | self.roots.append(rev) |
|
242 | self.roots.append(rev) | |
243 | return True |
|
243 | return True | |
244 | else: |
|
244 | else: | |
245 | # backwards: all parents |
|
245 | # backwards: all parents | |
246 | if not self.roots: |
|
246 | if not self.roots: | |
247 | self.roots.extend(realparents(self.startrev)) |
|
247 | self.roots.extend(realparents(self.startrev)) | |
248 | if rev in self.roots: |
|
248 | if rev in self.roots: | |
249 | self.roots.remove(rev) |
|
249 | self.roots.remove(rev) | |
250 | self.roots.extend(realparents(rev)) |
|
250 | self.roots.extend(realparents(rev)) | |
251 | return True |
|
251 | return True | |
252 |
|
252 | |||
253 | return False |
|
253 | return False | |
254 |
|
254 | |||
255 | if follow and not files: |
|
255 | if follow and not files: | |
256 | ff = followfilter(onlyfirst=opts.get('follow_first')) |
|
256 | ff = followfilter(onlyfirst=opts.get('follow_first')) | |
257 | def want(rev): |
|
257 | def want(rev): | |
258 | if rev not in wanted: |
|
258 | if rev not in wanted: | |
259 | return False |
|
259 | return False | |
260 | return ff.match(rev) |
|
260 | return ff.match(rev) | |
261 | else: |
|
261 | else: | |
262 | def want(rev): |
|
262 | def want(rev): | |
263 | return rev in wanted |
|
263 | return rev in wanted | |
264 |
|
264 | |||
265 | for i, window in increasing_windows(0, len(revs)): |
|
265 | for i, window in increasing_windows(0, len(revs)): | |
266 | yield 'window', revs[0] < revs[-1], revs[-1] |
|
266 | yield 'window', revs[0] < revs[-1], revs[-1] | |
267 | nrevs = [rev for rev in revs[i:i+window] if want(rev)] |
|
267 | nrevs = [rev for rev in revs[i:i+window] if want(rev)] | |
268 | srevs = list(nrevs) |
|
268 | srevs = list(nrevs) | |
269 | srevs.sort() |
|
269 | srevs.sort() | |
270 | for rev in srevs: |
|
270 | for rev in srevs: | |
271 | fns = fncache.get(rev) or filter(matchfn, getchange(rev)[3]) |
|
271 | fns = fncache.get(rev) or filter(matchfn, getchange(rev)[3]) | |
272 | yield 'add', rev, fns |
|
272 | yield 'add', rev, fns | |
273 | for rev in nrevs: |
|
273 | for rev in nrevs: | |
274 | yield 'iter', rev, None |
|
274 | yield 'iter', rev, None | |
275 | return iterate(), getchange, matchfn |
|
275 | return iterate(), getchange, matchfn | |
276 |
|
276 | |||
277 | revrangesep = ':' |
|
277 | revrangesep = ':' | |
278 |
|
278 | |||
279 | def revfix(repo, val, defval): |
|
279 | def revfix(repo, val, defval): | |
280 | '''turn user-level id of changeset into rev number. |
|
280 | '''turn user-level id of changeset into rev number. | |
281 | user-level id can be tag, changeset, rev number, or negative rev |
|
281 | user-level id can be tag, changeset, rev number, or negative rev | |
282 | number relative to number of revs (-1 is tip, etc).''' |
|
282 | number relative to number of revs (-1 is tip, etc).''' | |
283 | if not val: |
|
283 | if not val: | |
284 | return defval |
|
284 | return defval | |
285 | try: |
|
285 | try: | |
286 | num = int(val) |
|
286 | num = int(val) | |
287 | if str(num) != val: |
|
287 | if str(num) != val: | |
288 | raise ValueError |
|
288 | raise ValueError | |
289 | if num < 0: |
|
289 | if num < 0: | |
290 | num += repo.changelog.count() |
|
290 | num += repo.changelog.count() | |
291 | if num < 0: |
|
291 | if num < 0: | |
292 | num = 0 |
|
292 | num = 0 | |
293 | elif num >= repo.changelog.count(): |
|
293 | elif num >= repo.changelog.count(): | |
294 | raise ValueError |
|
294 | raise ValueError | |
295 | except ValueError: |
|
295 | except ValueError: | |
296 | try: |
|
296 | try: | |
297 | num = repo.changelog.rev(repo.lookup(val)) |
|
297 | num = repo.changelog.rev(repo.lookup(val)) | |
298 | except KeyError: |
|
298 | except KeyError: | |
299 | raise util.Abort(_('invalid revision identifier %s'), val) |
|
299 | raise util.Abort(_('invalid revision identifier %s'), val) | |
300 | return num |
|
300 | return num | |
301 |
|
301 | |||
302 | def revpair(ui, repo, revs): |
|
302 | def revpair(ui, repo, revs): | |
303 | '''return pair of nodes, given list of revisions. second item can |
|
303 | '''return pair of nodes, given list of revisions. second item can | |
304 | be None, meaning use working dir.''' |
|
304 | be None, meaning use working dir.''' | |
305 | if not revs: |
|
305 | if not revs: | |
306 | return repo.dirstate.parents()[0], None |
|
306 | return repo.dirstate.parents()[0], None | |
307 | end = None |
|
307 | end = None | |
308 | if len(revs) == 1: |
|
308 | if len(revs) == 1: | |
309 | start = revs[0] |
|
309 | start = revs[0] | |
310 | if revrangesep in start: |
|
310 | if revrangesep in start: | |
311 | start, end = start.split(revrangesep, 1) |
|
311 | start, end = start.split(revrangesep, 1) | |
312 | start = revfix(repo, start, 0) |
|
312 | start = revfix(repo, start, 0) | |
313 | end = revfix(repo, end, repo.changelog.count() - 1) |
|
313 | end = revfix(repo, end, repo.changelog.count() - 1) | |
314 | else: |
|
314 | else: | |
315 | start = revfix(repo, start, None) |
|
315 | start = revfix(repo, start, None) | |
316 | elif len(revs) == 2: |
|
316 | elif len(revs) == 2: | |
317 | if revrangesep in revs[0] or revrangesep in revs[1]: |
|
317 | if revrangesep in revs[0] or revrangesep in revs[1]: | |
318 | raise util.Abort(_('too many revisions specified')) |
|
318 | raise util.Abort(_('too many revisions specified')) | |
319 | start = revfix(repo, revs[0], None) |
|
319 | start = revfix(repo, revs[0], None) | |
320 | end = revfix(repo, revs[1], None) |
|
320 | end = revfix(repo, revs[1], None) | |
321 | else: |
|
321 | else: | |
322 | raise util.Abort(_('too many revisions specified')) |
|
322 | raise util.Abort(_('too many revisions specified')) | |
323 | if end is not None: end = repo.lookup(str(end)) |
|
323 | if end is not None: end = repo.lookup(str(end)) | |
324 | return repo.lookup(str(start)), end |
|
324 | return repo.lookup(str(start)), end | |
325 |
|
325 | |||
326 | def revrange(ui, repo, revs): |
|
326 | def revrange(ui, repo, revs): | |
327 | """Yield revision as strings from a list of revision specifications.""" |
|
327 | """Yield revision as strings from a list of revision specifications.""" | |
328 | seen = {} |
|
328 | seen = {} | |
329 | for spec in revs: |
|
329 | for spec in revs: | |
330 | if revrangesep in spec: |
|
330 | if revrangesep in spec: | |
331 | start, end = spec.split(revrangesep, 1) |
|
331 | start, end = spec.split(revrangesep, 1) | |
332 | start = revfix(repo, start, 0) |
|
332 | start = revfix(repo, start, 0) | |
333 | end = revfix(repo, end, repo.changelog.count() - 1) |
|
333 | end = revfix(repo, end, repo.changelog.count() - 1) | |
334 | step = start > end and -1 or 1 |
|
334 | step = start > end and -1 or 1 | |
335 | for rev in xrange(start, end+step, step): |
|
335 | for rev in xrange(start, end+step, step): | |
336 | if rev in seen: |
|
336 | if rev in seen: | |
337 | continue |
|
337 | continue | |
338 | seen[rev] = 1 |
|
338 | seen[rev] = 1 | |
339 | yield str(rev) |
|
339 | yield str(rev) | |
340 | else: |
|
340 | else: | |
341 | rev = revfix(repo, spec, None) |
|
341 | rev = revfix(repo, spec, None) | |
342 | if rev in seen: |
|
342 | if rev in seen: | |
343 | continue |
|
343 | continue | |
344 | seen[rev] = 1 |
|
344 | seen[rev] = 1 | |
345 | yield str(rev) |
|
345 | yield str(rev) | |
346 |
|
346 | |||
347 | def make_filename(repo, pat, node, |
|
347 | def make_filename(repo, pat, node, | |
348 | total=None, seqno=None, revwidth=None, pathname=None): |
|
348 | total=None, seqno=None, revwidth=None, pathname=None): | |
349 | node_expander = { |
|
349 | node_expander = { | |
350 | 'H': lambda: hex(node), |
|
350 | 'H': lambda: hex(node), | |
351 | 'R': lambda: str(repo.changelog.rev(node)), |
|
351 | 'R': lambda: str(repo.changelog.rev(node)), | |
352 | 'h': lambda: short(node), |
|
352 | 'h': lambda: short(node), | |
353 | } |
|
353 | } | |
354 | expander = { |
|
354 | expander = { | |
355 | '%': lambda: '%', |
|
355 | '%': lambda: '%', | |
356 | 'b': lambda: os.path.basename(repo.root), |
|
356 | 'b': lambda: os.path.basename(repo.root), | |
357 | } |
|
357 | } | |
358 |
|
358 | |||
359 | try: |
|
359 | try: | |
360 | if node: |
|
360 | if node: | |
361 | expander.update(node_expander) |
|
361 | expander.update(node_expander) | |
362 | if node and revwidth is not None: |
|
362 | if node and revwidth is not None: | |
363 | expander['r'] = (lambda: |
|
363 | expander['r'] = (lambda: | |
364 | str(repo.changelog.rev(node)).zfill(revwidth)) |
|
364 | str(repo.changelog.rev(node)).zfill(revwidth)) | |
365 | if total is not None: |
|
365 | if total is not None: | |
366 | expander['N'] = lambda: str(total) |
|
366 | expander['N'] = lambda: str(total) | |
367 | if seqno is not None: |
|
367 | if seqno is not None: | |
368 | expander['n'] = lambda: str(seqno) |
|
368 | expander['n'] = lambda: str(seqno) | |
369 | if total is not None and seqno is not None: |
|
369 | if total is not None and seqno is not None: | |
370 | expander['n'] = lambda:str(seqno).zfill(len(str(total))) |
|
370 | expander['n'] = lambda:str(seqno).zfill(len(str(total))) | |
371 | if pathname is not None: |
|
371 | if pathname is not None: | |
372 | expander['s'] = lambda: os.path.basename(pathname) |
|
372 | expander['s'] = lambda: os.path.basename(pathname) | |
373 | expander['d'] = lambda: os.path.dirname(pathname) or '.' |
|
373 | expander['d'] = lambda: os.path.dirname(pathname) or '.' | |
374 | expander['p'] = lambda: pathname |
|
374 | expander['p'] = lambda: pathname | |
375 |
|
375 | |||
376 | newname = [] |
|
376 | newname = [] | |
377 | patlen = len(pat) |
|
377 | patlen = len(pat) | |
378 | i = 0 |
|
378 | i = 0 | |
379 | while i < patlen: |
|
379 | while i < patlen: | |
380 | c = pat[i] |
|
380 | c = pat[i] | |
381 | if c == '%': |
|
381 | if c == '%': | |
382 | i += 1 |
|
382 | i += 1 | |
383 | c = pat[i] |
|
383 | c = pat[i] | |
384 | c = expander[c]() |
|
384 | c = expander[c]() | |
385 | newname.append(c) |
|
385 | newname.append(c) | |
386 | i += 1 |
|
386 | i += 1 | |
387 | return ''.join(newname) |
|
387 | return ''.join(newname) | |
388 | except KeyError, inst: |
|
388 | except KeyError, inst: | |
389 | raise util.Abort(_("invalid format spec '%%%s' in output file name"), |
|
389 | raise util.Abort(_("invalid format spec '%%%s' in output file name"), | |
390 | inst.args[0]) |
|
390 | inst.args[0]) | |
391 |
|
391 | |||
392 | def make_file(repo, pat, node=None, |
|
392 | def make_file(repo, pat, node=None, | |
393 | total=None, seqno=None, revwidth=None, mode='wb', pathname=None): |
|
393 | total=None, seqno=None, revwidth=None, mode='wb', pathname=None): | |
394 | if not pat or pat == '-': |
|
394 | if not pat or pat == '-': | |
395 | return 'w' in mode and sys.stdout or sys.stdin |
|
395 | return 'w' in mode and sys.stdout or sys.stdin | |
396 | if hasattr(pat, 'write') and 'w' in mode: |
|
396 | if hasattr(pat, 'write') and 'w' in mode: | |
397 | return pat |
|
397 | return pat | |
398 | if hasattr(pat, 'read') and 'r' in mode: |
|
398 | if hasattr(pat, 'read') and 'r' in mode: | |
399 | return pat |
|
399 | return pat | |
400 | return open(make_filename(repo, pat, node, total, seqno, revwidth, |
|
400 | return open(make_filename(repo, pat, node, total, seqno, revwidth, | |
401 | pathname), |
|
401 | pathname), | |
402 | mode) |
|
402 | mode) | |
403 |
|
403 | |||
404 | def write_bundle(cg, filename=None, compress=True): |
|
404 | def write_bundle(cg, filename=None, compress=True): | |
405 | """Write a bundle file and return its filename. |
|
405 | """Write a bundle file and return its filename. | |
406 |
|
406 | |||
407 | Existing files will not be overwritten. |
|
407 | Existing files will not be overwritten. | |
408 | If no filename is specified, a temporary file is created. |
|
408 | If no filename is specified, a temporary file is created. | |
409 | bz2 compression can be turned off. |
|
409 | bz2 compression can be turned off. | |
410 | The bundle file will be deleted in case of errors. |
|
410 | The bundle file will be deleted in case of errors. | |
411 | """ |
|
411 | """ | |
412 | class nocompress(object): |
|
412 | class nocompress(object): | |
413 | def compress(self, x): |
|
413 | def compress(self, x): | |
414 | return x |
|
414 | return x | |
415 | def flush(self): |
|
415 | def flush(self): | |
416 | return "" |
|
416 | return "" | |
417 |
|
417 | |||
418 | fh = None |
|
418 | fh = None | |
419 | cleanup = None |
|
419 | cleanup = None | |
420 | try: |
|
420 | try: | |
421 | if filename: |
|
421 | if filename: | |
422 | if os.path.exists(filename): |
|
422 | if os.path.exists(filename): | |
423 | raise util.Abort(_("file '%s' already exists"), filename) |
|
423 | raise util.Abort(_("file '%s' already exists"), filename) | |
424 | fh = open(filename, "wb") |
|
424 | fh = open(filename, "wb") | |
425 | else: |
|
425 | else: | |
426 | fd, filename = tempfile.mkstemp(prefix="hg-bundle-", suffix=".hg") |
|
426 | fd, filename = tempfile.mkstemp(prefix="hg-bundle-", suffix=".hg") | |
427 | fh = os.fdopen(fd, "wb") |
|
427 | fh = os.fdopen(fd, "wb") | |
428 | cleanup = filename |
|
428 | cleanup = filename | |
429 |
|
429 | |||
430 | if compress: |
|
430 | if compress: | |
431 | fh.write("HG10") |
|
431 | fh.write("HG10") | |
432 | z = bz2.BZ2Compressor(9) |
|
432 | z = bz2.BZ2Compressor(9) | |
433 | else: |
|
433 | else: | |
434 | fh.write("HG10UN") |
|
434 | fh.write("HG10UN") | |
435 | z = nocompress() |
|
435 | z = nocompress() | |
436 | # parse the changegroup data, otherwise we will block |
|
436 | # parse the changegroup data, otherwise we will block | |
437 | # in case of sshrepo because we don't know the end of the stream |
|
437 | # in case of sshrepo because we don't know the end of the stream | |
438 |
|
438 | |||
439 | # an empty chunkiter is the end of the changegroup |
|
439 | # an empty chunkiter is the end of the changegroup | |
440 | empty = False |
|
440 | empty = False | |
441 | while not empty: |
|
441 | while not empty: | |
442 | empty = True |
|
442 | empty = True | |
443 | for chunk in changegroup.chunkiter(cg): |
|
443 | for chunk in changegroup.chunkiter(cg): | |
444 | empty = False |
|
444 | empty = False | |
445 | fh.write(z.compress(changegroup.genchunk(chunk))) |
|
445 | fh.write(z.compress(changegroup.genchunk(chunk))) | |
446 | fh.write(z.compress(changegroup.closechunk())) |
|
446 | fh.write(z.compress(changegroup.closechunk())) | |
447 | fh.write(z.flush()) |
|
447 | fh.write(z.flush()) | |
448 | cleanup = None |
|
448 | cleanup = None | |
449 | return filename |
|
449 | return filename | |
450 | finally: |
|
450 | finally: | |
451 | if fh is not None: |
|
451 | if fh is not None: | |
452 | fh.close() |
|
452 | fh.close() | |
453 | if cleanup is not None: |
|
453 | if cleanup is not None: | |
454 | os.unlink(cleanup) |
|
454 | os.unlink(cleanup) | |
455 |
|
455 | |||
456 | def dodiff(fp, ui, repo, node1, node2, files=None, match=util.always, |
|
456 | def dodiff(fp, ui, repo, node1, node2, files=None, match=util.always, | |
457 | changes=None, text=False, opts={}): |
|
457 | changes=None, text=False, opts={}): | |
458 | if not node1: |
|
458 | if not node1: | |
459 | node1 = repo.dirstate.parents()[0] |
|
459 | node1 = repo.dirstate.parents()[0] | |
460 | # reading the data for node1 early allows it to play nicely |
|
460 | # reading the data for node1 early allows it to play nicely | |
461 | # with repo.changes and the revlog cache. |
|
461 | # with repo.changes and the revlog cache. | |
462 | change = repo.changelog.read(node1) |
|
462 | change = repo.changelog.read(node1) | |
463 | mmap = repo.manifest.read(change[0]) |
|
463 | mmap = repo.manifest.read(change[0]) | |
464 | date1 = util.datestr(change[2]) |
|
464 | date1 = util.datestr(change[2]) | |
465 |
|
465 | |||
466 | if not changes: |
|
466 | if not changes: | |
467 | changes = repo.changes(node1, node2, files, match=match) |
|
467 | changes = repo.changes(node1, node2, files, match=match) | |
468 | modified, added, removed, deleted, unknown = changes |
|
468 | modified, added, removed, deleted, unknown = changes | |
469 | if files: |
|
469 | if files: | |
470 | modified, added, removed = map(lambda x: filterfiles(files, x), |
|
470 | modified, added, removed = map(lambda x: filterfiles(files, x), | |
471 | (modified, added, removed)) |
|
471 | (modified, added, removed)) | |
472 |
|
472 | |||
473 | if not modified and not added and not removed: |
|
473 | if not modified and not added and not removed: | |
474 | return |
|
474 | return | |
475 |
|
475 | |||
476 | if node2: |
|
476 | if node2: | |
477 | change = repo.changelog.read(node2) |
|
477 | change = repo.changelog.read(node2) | |
478 | mmap2 = repo.manifest.read(change[0]) |
|
478 | mmap2 = repo.manifest.read(change[0]) | |
479 | _date2 = util.datestr(change[2]) |
|
479 | _date2 = util.datestr(change[2]) | |
480 | def date2(f): |
|
480 | def date2(f): | |
481 | return _date2 |
|
481 | return _date2 | |
482 | def read(f): |
|
482 | def read(f): | |
483 | return repo.file(f).read(mmap2[f]) |
|
483 | return repo.file(f).read(mmap2[f]) | |
484 | else: |
|
484 | else: | |
485 | tz = util.makedate()[1] |
|
485 | tz = util.makedate()[1] | |
486 | _date2 = util.datestr() |
|
486 | _date2 = util.datestr() | |
487 | def date2(f): |
|
487 | def date2(f): | |
488 | try: |
|
488 | try: | |
489 | return util.datestr((os.lstat(repo.wjoin(f)).st_mtime, tz)) |
|
489 | return util.datestr((os.lstat(repo.wjoin(f)).st_mtime, tz)) | |
490 | except OSError, err: |
|
490 | except OSError, err: | |
491 | if err.errno != errno.ENOENT: raise |
|
491 | if err.errno != errno.ENOENT: raise | |
492 | return _date2 |
|
492 | return _date2 | |
493 | def read(f): |
|
493 | def read(f): | |
494 | return repo.wread(f) |
|
494 | return repo.wread(f) | |
495 |
|
495 | |||
496 | if ui.quiet: |
|
496 | if ui.quiet: | |
497 | r = None |
|
497 | r = None | |
498 | else: |
|
498 | else: | |
499 | hexfunc = ui.verbose and hex or short |
|
499 | hexfunc = ui.verbose and hex or short | |
500 | r = [hexfunc(node) for node in [node1, node2] if node] |
|
500 | r = [hexfunc(node) for node in [node1, node2] if node] | |
501 |
|
501 | |||
502 | diffopts = ui.diffopts() |
|
502 | diffopts = ui.diffopts() | |
503 | showfunc = opts.get('show_function') or diffopts['showfunc'] |
|
503 | showfunc = opts.get('show_function') or diffopts['showfunc'] | |
504 | ignorews = opts.get('ignore_all_space') or diffopts['ignorews'] |
|
504 | ignorews = opts.get('ignore_all_space') or diffopts['ignorews'] | |
505 | ignorewsamount = opts.get('ignore_space_change') or \ |
|
505 | ignorewsamount = opts.get('ignore_space_change') or \ | |
506 | diffopts['ignorewsamount'] |
|
506 | diffopts['ignorewsamount'] | |
507 | ignoreblanklines = opts.get('ignore_blank_lines') or \ |
|
507 | ignoreblanklines = opts.get('ignore_blank_lines') or \ | |
508 | diffopts['ignoreblanklines'] |
|
508 | diffopts['ignoreblanklines'] | |
509 |
|
509 | |||
510 | all = modified + added + removed |
|
510 | all = modified + added + removed | |
511 | all.sort() |
|
511 | all.sort() | |
512 | for f in all: |
|
512 | for f in all: | |
513 | to = None |
|
513 | to = None | |
514 | tn = None |
|
514 | tn = None | |
515 | if f in mmap: |
|
515 | if f in mmap: | |
516 | to = repo.file(f).read(mmap[f]) |
|
516 | to = repo.file(f).read(mmap[f]) | |
517 | if f not in removed: |
|
517 | if f not in removed: | |
518 | tn = read(f) |
|
518 | tn = read(f) | |
519 | fp.write(mdiff.unidiff(to, date1, tn, date2(f), f, r, text=text, |
|
519 | fp.write(mdiff.unidiff(to, date1, tn, date2(f), f, r, text=text, | |
520 | showfunc=showfunc, ignorews=ignorews, |
|
520 | showfunc=showfunc, ignorews=ignorews, | |
521 | ignorewsamount=ignorewsamount, |
|
521 | ignorewsamount=ignorewsamount, | |
522 | ignoreblanklines=ignoreblanklines)) |
|
522 | ignoreblanklines=ignoreblanklines)) | |
523 |
|
523 | |||
524 | def trimuser(ui, name, rev, revcache): |
|
524 | def trimuser(ui, name, rev, revcache): | |
525 | """trim the name of the user who committed a change""" |
|
525 | """trim the name of the user who committed a change""" | |
526 | user = revcache.get(rev) |
|
526 | user = revcache.get(rev) | |
527 | if user is None: |
|
527 | if user is None: | |
528 | user = revcache[rev] = ui.shortuser(name) |
|
528 | user = revcache[rev] = ui.shortuser(name) | |
529 | return user |
|
529 | return user | |
530 |
|
530 | |||
531 | class changeset_printer(object): |
|
531 | class changeset_printer(object): | |
532 | '''show changeset information when templating not requested.''' |
|
532 | '''show changeset information when templating not requested.''' | |
533 |
|
533 | |||
534 | def __init__(self, ui, repo): |
|
534 | def __init__(self, ui, repo): | |
535 | self.ui = ui |
|
535 | self.ui = ui | |
536 | self.repo = repo |
|
536 | self.repo = repo | |
537 |
|
537 | |||
538 | def show(self, rev=0, changenode=None, brinfo=None): |
|
538 | def show(self, rev=0, changenode=None, brinfo=None): | |
539 | '''show a single changeset or file revision''' |
|
539 | '''show a single changeset or file revision''' | |
540 | log = self.repo.changelog |
|
540 | log = self.repo.changelog | |
541 | if changenode is None: |
|
541 | if changenode is None: | |
542 | changenode = log.node(rev) |
|
542 | changenode = log.node(rev) | |
543 | elif not rev: |
|
543 | elif not rev: | |
544 | rev = log.rev(changenode) |
|
544 | rev = log.rev(changenode) | |
545 |
|
545 | |||
546 | if self.ui.quiet: |
|
546 | if self.ui.quiet: | |
547 | self.ui.write("%d:%s\n" % (rev, short(changenode))) |
|
547 | self.ui.write("%d:%s\n" % (rev, short(changenode))) | |
548 | return |
|
548 | return | |
549 |
|
549 | |||
550 | changes = log.read(changenode) |
|
550 | changes = log.read(changenode) | |
551 | date = util.datestr(changes[2]) |
|
551 | date = util.datestr(changes[2]) | |
552 |
|
552 | |||
553 | parents = [(log.rev(p), self.ui.verbose and hex(p) or short(p)) |
|
553 | parents = [(log.rev(p), self.ui.verbose and hex(p) or short(p)) | |
554 | for p in log.parents(changenode) |
|
554 | for p in log.parents(changenode) | |
555 | if self.ui.debugflag or p != nullid] |
|
555 | if self.ui.debugflag or p != nullid] | |
556 | if (not self.ui.debugflag and len(parents) == 1 and |
|
556 | if (not self.ui.debugflag and len(parents) == 1 and | |
557 | parents[0][0] == rev-1): |
|
557 | parents[0][0] == rev-1): | |
558 | parents = [] |
|
558 | parents = [] | |
559 |
|
559 | |||
560 | if self.ui.verbose: |
|
560 | if self.ui.verbose: | |
561 | self.ui.write(_("changeset: %d:%s\n") % (rev, hex(changenode))) |
|
561 | self.ui.write(_("changeset: %d:%s\n") % (rev, hex(changenode))) | |
562 | else: |
|
562 | else: | |
563 | self.ui.write(_("changeset: %d:%s\n") % (rev, short(changenode))) |
|
563 | self.ui.write(_("changeset: %d:%s\n") % (rev, short(changenode))) | |
564 |
|
564 | |||
565 | for tag in self.repo.nodetags(changenode): |
|
565 | for tag in self.repo.nodetags(changenode): | |
566 | self.ui.status(_("tag: %s\n") % tag) |
|
566 | self.ui.status(_("tag: %s\n") % tag) | |
567 | for parent in parents: |
|
567 | for parent in parents: | |
568 | self.ui.write(_("parent: %d:%s\n") % parent) |
|
568 | self.ui.write(_("parent: %d:%s\n") % parent) | |
569 |
|
569 | |||
570 | if brinfo and changenode in brinfo: |
|
570 | if brinfo and changenode in brinfo: | |
571 | br = brinfo[changenode] |
|
571 | br = brinfo[changenode] | |
572 | self.ui.write(_("branch: %s\n") % " ".join(br)) |
|
572 | self.ui.write(_("branch: %s\n") % " ".join(br)) | |
573 |
|
573 | |||
574 | self.ui.debug(_("manifest: %d:%s\n") % |
|
574 | self.ui.debug(_("manifest: %d:%s\n") % | |
575 | (self.repo.manifest.rev(changes[0]), hex(changes[0]))) |
|
575 | (self.repo.manifest.rev(changes[0]), hex(changes[0]))) | |
576 | self.ui.status(_("user: %s\n") % changes[1]) |
|
576 | self.ui.status(_("user: %s\n") % changes[1]) | |
577 | self.ui.status(_("date: %s\n") % date) |
|
577 | self.ui.status(_("date: %s\n") % date) | |
578 |
|
578 | |||
579 | if self.ui.debugflag: |
|
579 | if self.ui.debugflag: | |
580 | files = self.repo.changes(log.parents(changenode)[0], changenode) |
|
580 | files = self.repo.changes(log.parents(changenode)[0], changenode) | |
581 | for key, value in zip([_("files:"), _("files+:"), _("files-:")], |
|
581 | for key, value in zip([_("files:"), _("files+:"), _("files-:")], | |
582 | files): |
|
582 | files): | |
583 | if value: |
|
583 | if value: | |
584 | self.ui.note("%-12s %s\n" % (key, " ".join(value))) |
|
584 | self.ui.note("%-12s %s\n" % (key, " ".join(value))) | |
585 | else: |
|
585 | else: | |
586 | self.ui.note(_("files: %s\n") % " ".join(changes[3])) |
|
586 | self.ui.note(_("files: %s\n") % " ".join(changes[3])) | |
587 |
|
587 | |||
588 | description = changes[4].strip() |
|
588 | description = changes[4].strip() | |
589 | if description: |
|
589 | if description: | |
590 | if self.ui.verbose: |
|
590 | if self.ui.verbose: | |
591 | self.ui.status(_("description:\n")) |
|
591 | self.ui.status(_("description:\n")) | |
592 | self.ui.status(description) |
|
592 | self.ui.status(description) | |
593 | self.ui.status("\n\n") |
|
593 | self.ui.status("\n\n") | |
594 | else: |
|
594 | else: | |
595 | self.ui.status(_("summary: %s\n") % |
|
595 | self.ui.status(_("summary: %s\n") % | |
596 | description.splitlines()[0]) |
|
596 | description.splitlines()[0]) | |
597 | self.ui.status("\n") |
|
597 | self.ui.status("\n") | |
598 |
|
598 | |||
599 | def show_changeset(ui, repo, opts): |
|
599 | def show_changeset(ui, repo, opts): | |
600 | '''show one changeset. uses template or regular display. caller |
|
600 | '''show one changeset. uses template or regular display. caller | |
601 | can pass in 'style' and 'template' options in opts.''' |
|
601 | can pass in 'style' and 'template' options in opts.''' | |
602 |
|
602 | |||
603 | tmpl = opts.get('template') |
|
603 | tmpl = opts.get('template') | |
604 | if tmpl: |
|
604 | if tmpl: | |
605 | tmpl = templater.parsestring(tmpl, quoted=False) |
|
605 | tmpl = templater.parsestring(tmpl, quoted=False) | |
606 | else: |
|
606 | else: | |
607 | tmpl = ui.config('ui', 'logtemplate') |
|
607 | tmpl = ui.config('ui', 'logtemplate') | |
608 | if tmpl: tmpl = templater.parsestring(tmpl) |
|
608 | if tmpl: tmpl = templater.parsestring(tmpl) | |
609 | mapfile = opts.get('style') or ui.config('ui', 'style') |
|
609 | mapfile = opts.get('style') or ui.config('ui', 'style') | |
610 | if tmpl or mapfile: |
|
610 | if tmpl or mapfile: | |
611 | if mapfile: |
|
611 | if mapfile: | |
612 | if not os.path.isfile(mapfile): |
|
612 | if not os.path.isfile(mapfile): | |
613 | mapname = templater.templatepath('map-cmdline.' + mapfile) |
|
613 | mapname = templater.templatepath('map-cmdline.' + mapfile) | |
614 | if not mapname: mapname = templater.templatepath(mapfile) |
|
614 | if not mapname: mapname = templater.templatepath(mapfile) | |
615 | if mapname: mapfile = mapname |
|
615 | if mapname: mapfile = mapname | |
616 | try: |
|
616 | try: | |
617 | t = templater.changeset_templater(ui, repo, mapfile) |
|
617 | t = templater.changeset_templater(ui, repo, mapfile) | |
618 | except SyntaxError, inst: |
|
618 | except SyntaxError, inst: | |
619 | raise util.Abort(inst.args[0]) |
|
619 | raise util.Abort(inst.args[0]) | |
620 | if tmpl: t.use_template(tmpl) |
|
620 | if tmpl: t.use_template(tmpl) | |
621 | return t |
|
621 | return t | |
622 | return changeset_printer(ui, repo) |
|
622 | return changeset_printer(ui, repo) | |
623 |
|
623 | |||
624 | def setremoteconfig(ui, opts): |
|
624 | def setremoteconfig(ui, opts): | |
625 | "copy remote options to ui tree" |
|
625 | "copy remote options to ui tree" | |
626 | if opts.get('ssh'): |
|
626 | if opts.get('ssh'): | |
627 | ui.setconfig("ui", "ssh", opts['ssh']) |
|
627 | ui.setconfig("ui", "ssh", opts['ssh']) | |
628 | if opts.get('remotecmd'): |
|
628 | if opts.get('remotecmd'): | |
629 | ui.setconfig("ui", "remotecmd", opts['remotecmd']) |
|
629 | ui.setconfig("ui", "remotecmd", opts['remotecmd']) | |
630 |
|
630 | |||
631 | def show_version(ui): |
|
631 | def show_version(ui): | |
632 | """output version and copyright information""" |
|
632 | """output version and copyright information""" | |
633 | ui.write(_("Mercurial Distributed SCM (version %s)\n") |
|
633 | ui.write(_("Mercurial Distributed SCM (version %s)\n") | |
634 | % version.get_version()) |
|
634 | % version.get_version()) | |
635 | ui.status(_( |
|
635 | ui.status(_( | |
636 | "\nCopyright (C) 2005 Matt Mackall <mpm@selenic.com>\n" |
|
636 | "\nCopyright (C) 2005 Matt Mackall <mpm@selenic.com>\n" | |
637 | "This is free software; see the source for copying conditions. " |
|
637 | "This is free software; see the source for copying conditions. " | |
638 | "There is NO\nwarranty; " |
|
638 | "There is NO\nwarranty; " | |
639 | "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" |
|
639 | "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" | |
640 | )) |
|
640 | )) | |
641 |
|
641 | |||
642 | def help_(ui, name=None, with_version=False): |
|
642 | def help_(ui, name=None, with_version=False): | |
643 | """show help for a command, extension, or list of commands |
|
643 | """show help for a command, extension, or list of commands | |
644 |
|
644 | |||
645 | With no arguments, print a list of commands and short help. |
|
645 | With no arguments, print a list of commands and short help. | |
646 |
|
646 | |||
647 | Given a command name, print help for that command. |
|
647 | Given a command name, print help for that command. | |
648 |
|
648 | |||
649 | Given an extension name, print help for that extension, and the |
|
649 | Given an extension name, print help for that extension, and the | |
650 | commands it provides.""" |
|
650 | commands it provides.""" | |
651 | option_lists = [] |
|
651 | option_lists = [] | |
652 |
|
652 | |||
653 | def helpcmd(name): |
|
653 | def helpcmd(name): | |
654 | if with_version: |
|
654 | if with_version: | |
655 | show_version(ui) |
|
655 | show_version(ui) | |
656 | ui.write('\n') |
|
656 | ui.write('\n') | |
657 | aliases, i = findcmd(name) |
|
657 | aliases, i = findcmd(name) | |
658 | # synopsis |
|
658 | # synopsis | |
659 | ui.write("%s\n\n" % i[2]) |
|
659 | ui.write("%s\n\n" % i[2]) | |
660 |
|
660 | |||
661 | # description |
|
661 | # description | |
662 | doc = i[0].__doc__ |
|
662 | doc = i[0].__doc__ | |
663 | if not doc: |
|
663 | if not doc: | |
664 | doc = _("(No help text available)") |
|
664 | doc = _("(No help text available)") | |
665 | if ui.quiet: |
|
665 | if ui.quiet: | |
666 | doc = doc.splitlines(0)[0] |
|
666 | doc = doc.splitlines(0)[0] | |
667 | ui.write("%s\n" % doc.rstrip()) |
|
667 | ui.write("%s\n" % doc.rstrip()) | |
668 |
|
668 | |||
669 | if not ui.quiet: |
|
669 | if not ui.quiet: | |
670 | # aliases |
|
670 | # aliases | |
671 | if len(aliases) > 1: |
|
671 | if len(aliases) > 1: | |
672 | ui.write(_("\naliases: %s\n") % ', '.join(aliases[1:])) |
|
672 | ui.write(_("\naliases: %s\n") % ', '.join(aliases[1:])) | |
673 |
|
673 | |||
674 | # options |
|
674 | # options | |
675 | if i[1]: |
|
675 | if i[1]: | |
676 | option_lists.append(("options", i[1])) |
|
676 | option_lists.append(("options", i[1])) | |
677 |
|
677 | |||
678 | def helplist(select=None): |
|
678 | def helplist(select=None): | |
679 | h = {} |
|
679 | h = {} | |
680 | cmds = {} |
|
680 | cmds = {} | |
681 | for c, e in table.items(): |
|
681 | for c, e in table.items(): | |
682 | f = c.split("|", 1)[0] |
|
682 | f = c.split("|", 1)[0] | |
683 | if select and not select(f): |
|
683 | if select and not select(f): | |
684 | continue |
|
684 | continue | |
685 | if name == "shortlist" and not f.startswith("^"): |
|
685 | if name == "shortlist" and not f.startswith("^"): | |
686 | continue |
|
686 | continue | |
687 | f = f.lstrip("^") |
|
687 | f = f.lstrip("^") | |
688 | if not ui.debugflag and f.startswith("debug"): |
|
688 | if not ui.debugflag and f.startswith("debug"): | |
689 | continue |
|
689 | continue | |
690 | doc = e[0].__doc__ |
|
690 | doc = e[0].__doc__ | |
691 | if not doc: |
|
691 | if not doc: | |
692 | doc = _("(No help text available)") |
|
692 | doc = _("(No help text available)") | |
693 | h[f] = doc.splitlines(0)[0].rstrip() |
|
693 | h[f] = doc.splitlines(0)[0].rstrip() | |
694 | cmds[f] = c.lstrip("^") |
|
694 | cmds[f] = c.lstrip("^") | |
695 |
|
695 | |||
696 | fns = h.keys() |
|
696 | fns = h.keys() | |
697 | fns.sort() |
|
697 | fns.sort() | |
698 | m = max(map(len, fns)) |
|
698 | m = max(map(len, fns)) | |
699 | for f in fns: |
|
699 | for f in fns: | |
700 | if ui.verbose: |
|
700 | if ui.verbose: | |
701 | commands = cmds[f].replace("|",", ") |
|
701 | commands = cmds[f].replace("|",", ") | |
702 | ui.write(" %s:\n %s\n"%(commands, h[f])) |
|
702 | ui.write(" %s:\n %s\n"%(commands, h[f])) | |
703 | else: |
|
703 | else: | |
704 | ui.write(' %-*s %s\n' % (m, f, h[f])) |
|
704 | ui.write(' %-*s %s\n' % (m, f, h[f])) | |
705 |
|
705 | |||
706 | def helpext(name): |
|
706 | def helpext(name): | |
707 | try: |
|
707 | try: | |
708 | mod = findext(name) |
|
708 | mod = findext(name) | |
709 | except KeyError: |
|
709 | except KeyError: | |
710 | raise UnknownCommand(name) |
|
710 | raise UnknownCommand(name) | |
711 |
|
711 | |||
712 | doc = (mod.__doc__ or _('No help text available')).splitlines(0) |
|
712 | doc = (mod.__doc__ or _('No help text available')).splitlines(0) | |
713 | ui.write(_('%s extension - %s\n') % (name.split('.')[-1], doc[0])) |
|
713 | ui.write(_('%s extension - %s\n') % (name.split('.')[-1], doc[0])) | |
714 | for d in doc[1:]: |
|
714 | for d in doc[1:]: | |
715 | ui.write(d, '\n') |
|
715 | ui.write(d, '\n') | |
716 |
|
716 | |||
717 | ui.status('\n') |
|
717 | ui.status('\n') | |
718 | if ui.verbose: |
|
718 | if ui.verbose: | |
719 | ui.status(_('list of commands:\n\n')) |
|
719 | ui.status(_('list of commands:\n\n')) | |
720 | else: |
|
720 | else: | |
721 | ui.status(_('list of commands (use "hg help -v %s" ' |
|
721 | ui.status(_('list of commands (use "hg help -v %s" ' | |
722 | 'to show aliases and global options):\n\n') % name) |
|
722 | 'to show aliases and global options):\n\n') % name) | |
723 |
|
723 | |||
724 | modcmds = dict.fromkeys([c.split('|', 1)[0] for c in mod.cmdtable]) |
|
724 | modcmds = dict.fromkeys([c.split('|', 1)[0] for c in mod.cmdtable]) | |
725 | helplist(modcmds.has_key) |
|
725 | helplist(modcmds.has_key) | |
726 |
|
726 | |||
727 | if name and name != 'shortlist': |
|
727 | if name and name != 'shortlist': | |
728 | try: |
|
728 | try: | |
729 | helpcmd(name) |
|
729 | helpcmd(name) | |
730 | except UnknownCommand: |
|
730 | except UnknownCommand: | |
731 | helpext(name) |
|
731 | helpext(name) | |
732 |
|
732 | |||
733 | else: |
|
733 | else: | |
734 | # program name |
|
734 | # program name | |
735 | if ui.verbose or with_version: |
|
735 | if ui.verbose or with_version: | |
736 | show_version(ui) |
|
736 | show_version(ui) | |
737 | else: |
|
737 | else: | |
738 | ui.status(_("Mercurial Distributed SCM\n")) |
|
738 | ui.status(_("Mercurial Distributed SCM\n")) | |
739 | ui.status('\n') |
|
739 | ui.status('\n') | |
740 |
|
740 | |||
741 | # list of commands |
|
741 | # list of commands | |
742 | if name == "shortlist": |
|
742 | if name == "shortlist": | |
743 | ui.status(_('basic commands (use "hg help" ' |
|
743 | ui.status(_('basic commands (use "hg help" ' | |
744 | 'for the full list or option "-v" for details):\n\n')) |
|
744 | 'for the full list or option "-v" for details):\n\n')) | |
745 | elif ui.verbose: |
|
745 | elif ui.verbose: | |
746 | ui.status(_('list of commands:\n\n')) |
|
746 | ui.status(_('list of commands:\n\n')) | |
747 | else: |
|
747 | else: | |
748 | ui.status(_('list of commands (use "hg help -v" ' |
|
748 | ui.status(_('list of commands (use "hg help -v" ' | |
749 | 'to show aliases and global options):\n\n')) |
|
749 | 'to show aliases and global options):\n\n')) | |
750 |
|
750 | |||
751 | helplist() |
|
751 | helplist() | |
752 |
|
752 | |||
753 | # global options |
|
753 | # global options | |
754 | if ui.verbose: |
|
754 | if ui.verbose: | |
755 | option_lists.append(("global options", globalopts)) |
|
755 | option_lists.append(("global options", globalopts)) | |
756 |
|
756 | |||
757 | # list all option lists |
|
757 | # list all option lists | |
758 | opt_output = [] |
|
758 | opt_output = [] | |
759 | for title, options in option_lists: |
|
759 | for title, options in option_lists: | |
760 | opt_output.append(("\n%s:\n" % title, None)) |
|
760 | opt_output.append(("\n%s:\n" % title, None)) | |
761 | for shortopt, longopt, default, desc in options: |
|
761 | for shortopt, longopt, default, desc in options: | |
762 | opt_output.append(("%2s%s" % (shortopt and "-%s" % shortopt, |
|
762 | opt_output.append(("%2s%s" % (shortopt and "-%s" % shortopt, | |
763 | longopt and " --%s" % longopt), |
|
763 | longopt and " --%s" % longopt), | |
764 | "%s%s" % (desc, |
|
764 | "%s%s" % (desc, | |
765 | default |
|
765 | default | |
766 | and _(" (default: %s)") % default |
|
766 | and _(" (default: %s)") % default | |
767 | or ""))) |
|
767 | or ""))) | |
768 |
|
768 | |||
769 | if opt_output: |
|
769 | if opt_output: | |
770 | opts_len = max([len(line[0]) for line in opt_output if line[1]]) |
|
770 | opts_len = max([len(line[0]) for line in opt_output if line[1]]) | |
771 | for first, second in opt_output: |
|
771 | for first, second in opt_output: | |
772 | if second: |
|
772 | if second: | |
773 | ui.write(" %-*s %s\n" % (opts_len, first, second)) |
|
773 | ui.write(" %-*s %s\n" % (opts_len, first, second)) | |
774 | else: |
|
774 | else: | |
775 | ui.write("%s\n" % first) |
|
775 | ui.write("%s\n" % first) | |
776 |
|
776 | |||
777 | # Commands start here, listed alphabetically |
|
777 | # Commands start here, listed alphabetically | |
778 |
|
778 | |||
779 | def add(ui, repo, *pats, **opts): |
|
779 | def add(ui, repo, *pats, **opts): | |
780 | """add the specified files on the next commit |
|
780 | """add the specified files on the next commit | |
781 |
|
781 | |||
782 | Schedule files to be version controlled and added to the repository. |
|
782 | Schedule files to be version controlled and added to the repository. | |
783 |
|
783 | |||
784 | The files will be added to the repository at the next commit. |
|
784 | The files will be added to the repository at the next commit. | |
785 |
|
785 | |||
786 | If no names are given, add all files in the repository. |
|
786 | If no names are given, add all files in the repository. | |
787 | """ |
|
787 | """ | |
788 |
|
788 | |||
789 | names = [] |
|
789 | names = [] | |
790 | for src, abs, rel, exact in walk(repo, pats, opts): |
|
790 | for src, abs, rel, exact in walk(repo, pats, opts): | |
791 | if exact: |
|
791 | if exact: | |
792 | if ui.verbose: |
|
792 | if ui.verbose: | |
793 | ui.status(_('adding %s\n') % rel) |
|
793 | ui.status(_('adding %s\n') % rel) | |
794 | names.append(abs) |
|
794 | names.append(abs) | |
795 | elif repo.dirstate.state(abs) == '?': |
|
795 | elif repo.dirstate.state(abs) == '?': | |
796 | ui.status(_('adding %s\n') % rel) |
|
796 | ui.status(_('adding %s\n') % rel) | |
797 | names.append(abs) |
|
797 | names.append(abs) | |
798 | if not opts.get('dry_run'): |
|
798 | if not opts.get('dry_run'): | |
799 | repo.add(names) |
|
799 | repo.add(names) | |
800 |
|
800 | |||
801 | def addremove(ui, repo, *pats, **opts): |
|
801 | def addremove(ui, repo, *pats, **opts): | |
802 | """add all new files, delete all missing files (DEPRECATED) |
|
802 | """add all new files, delete all missing files (DEPRECATED) | |
803 |
|
803 | |||
804 | (DEPRECATED) |
|
804 | (DEPRECATED) | |
805 | Add all new files and remove all missing files from the repository. |
|
805 | Add all new files and remove all missing files from the repository. | |
806 |
|
806 | |||
807 | New files are ignored if they match any of the patterns in .hgignore. As |
|
807 | New files are ignored if they match any of the patterns in .hgignore. As | |
808 | with add, these changes take effect at the next commit. |
|
808 | with add, these changes take effect at the next commit. | |
809 |
|
809 | |||
810 | This command is now deprecated and will be removed in a future |
|
810 | This command is now deprecated and will be removed in a future | |
811 | release. Please use add and remove --after instead. |
|
811 | release. Please use add and remove --after instead. | |
812 | """ |
|
812 | """ | |
813 | ui.warn(_('(the addremove command is deprecated; use add and remove ' |
|
813 | ui.warn(_('(the addremove command is deprecated; use add and remove ' | |
814 | '--after instead)\n')) |
|
814 | '--after instead)\n')) | |
815 | return addremove_lock(ui, repo, pats, opts) |
|
815 | return addremove_lock(ui, repo, pats, opts) | |
816 |
|
816 | |||
817 | def addremove_lock(ui, repo, pats, opts, wlock=None): |
|
817 | def addremove_lock(ui, repo, pats, opts, wlock=None): | |
818 | add, remove = [], [] |
|
818 | add, remove = [], [] | |
819 | for src, abs, rel, exact in walk(repo, pats, opts): |
|
819 | for src, abs, rel, exact in walk(repo, pats, opts): | |
820 | if src == 'f' and repo.dirstate.state(abs) == '?': |
|
820 | if src == 'f' and repo.dirstate.state(abs) == '?': | |
821 | add.append(abs) |
|
821 | add.append(abs) | |
822 | if ui.verbose or not exact: |
|
822 | if ui.verbose or not exact: | |
823 | ui.status(_('adding %s\n') % ((pats and rel) or abs)) |
|
823 | ui.status(_('adding %s\n') % ((pats and rel) or abs)) | |
824 | if repo.dirstate.state(abs) != 'r' and not os.path.exists(rel): |
|
824 | if repo.dirstate.state(abs) != 'r' and not os.path.exists(rel): | |
825 | remove.append(abs) |
|
825 | remove.append(abs) | |
826 | if ui.verbose or not exact: |
|
826 | if ui.verbose or not exact: | |
827 | ui.status(_('removing %s\n') % ((pats and rel) or abs)) |
|
827 | ui.status(_('removing %s\n') % ((pats and rel) or abs)) | |
828 | if not opts.get('dry_run'): |
|
828 | if not opts.get('dry_run'): | |
829 | repo.add(add, wlock=wlock) |
|
829 | repo.add(add, wlock=wlock) | |
830 | repo.remove(remove, wlock=wlock) |
|
830 | repo.remove(remove, wlock=wlock) | |
831 |
|
831 | |||
832 | def annotate(ui, repo, *pats, **opts): |
|
832 | def annotate(ui, repo, *pats, **opts): | |
833 | """show changeset information per file line |
|
833 | """show changeset information per file line | |
834 |
|
834 | |||
835 | List changes in files, showing the revision id responsible for each line |
|
835 | List changes in files, showing the revision id responsible for each line | |
836 |
|
836 | |||
837 | This command is useful to discover who did a change or when a change took |
|
837 | This command is useful to discover who did a change or when a change took | |
838 | place. |
|
838 | place. | |
839 |
|
839 | |||
840 | Without the -a option, annotate will avoid processing files it |
|
840 | Without the -a option, annotate will avoid processing files it | |
841 | detects as binary. With -a, annotate will generate an annotation |
|
841 | detects as binary. With -a, annotate will generate an annotation | |
842 | anyway, probably with undesirable results. |
|
842 | anyway, probably with undesirable results. | |
843 | """ |
|
843 | """ | |
844 | def getnode(rev): |
|
844 | def getnode(rev): | |
845 | return short(repo.changelog.node(rev)) |
|
845 | return short(repo.changelog.node(rev)) | |
846 |
|
846 | |||
847 | ucache = {} |
|
847 | ucache = {} | |
848 | def getname(rev): |
|
848 | def getname(rev): | |
849 | try: |
|
849 | try: | |
850 | return ucache[rev] |
|
850 | return ucache[rev] | |
851 | except: |
|
851 | except: | |
852 | u = trimuser(ui, repo.changectx(rev).user(), rev, ucache) |
|
852 | u = trimuser(ui, repo.changectx(rev).user(), rev, ucache) | |
853 | ucache[rev] = u |
|
853 | ucache[rev] = u | |
854 | return u |
|
854 | return u | |
855 |
|
855 | |||
856 | dcache = {} |
|
856 | dcache = {} | |
857 | def getdate(rev): |
|
857 | def getdate(rev): | |
858 | datestr = dcache.get(rev) |
|
858 | datestr = dcache.get(rev) | |
859 | if datestr is None: |
|
859 | if datestr is None: | |
860 | datestr = dcache[rev] = util.datestr(repo.changectx(rev).date()) |
|
860 | datestr = dcache[rev] = util.datestr(repo.changectx(rev).date()) | |
861 | return datestr |
|
861 | return datestr | |
862 |
|
862 | |||
863 | if not pats: |
|
863 | if not pats: | |
864 | raise util.Abort(_('at least one file name or pattern required')) |
|
864 | raise util.Abort(_('at least one file name or pattern required')) | |
865 |
|
865 | |||
866 | opmap = [['user', getname], ['number', str], ['changeset', getnode], |
|
866 | opmap = [['user', getname], ['number', str], ['changeset', getnode], | |
867 | ['date', getdate]] |
|
867 | ['date', getdate]] | |
868 | if not opts['user'] and not opts['changeset'] and not opts['date']: |
|
868 | if not opts['user'] and not opts['changeset'] and not opts['date']: | |
869 | opts['number'] = 1 |
|
869 | opts['number'] = 1 | |
870 |
|
870 | |||
871 | ctx = repo.changectx(opts['rev'] or repo.dirstate.parents()[0]) |
|
871 | ctx = repo.changectx(opts['rev'] or repo.dirstate.parents()[0]) | |
872 |
|
872 | |||
873 | for src, abs, rel, exact in walk(repo, pats, opts, node=ctx.node()): |
|
873 | for src, abs, rel, exact in walk(repo, pats, opts, node=ctx.node()): | |
874 | fctx = ctx.filectx(abs) |
|
874 | fctx = ctx.filectx(abs) | |
875 | if not opts['text'] and util.binary(fctx.data()): |
|
875 | if not opts['text'] and util.binary(fctx.data()): | |
876 | ui.write(_("%s: binary file\n") % ((pats and rel) or abs)) |
|
876 | ui.write(_("%s: binary file\n") % ((pats and rel) or abs)) | |
877 | continue |
|
877 | continue | |
878 |
|
878 | |||
879 | lines = fctx.annotate() |
|
879 | lines = fctx.annotate() | |
880 | pieces = [] |
|
880 | pieces = [] | |
881 |
|
881 | |||
882 | for o, f in opmap: |
|
882 | for o, f in opmap: | |
883 | if opts[o]: |
|
883 | if opts[o]: | |
884 | l = [f(n) for n, dummy in lines] |
|
884 | l = [f(n) for n, dummy in lines] | |
885 | if l: |
|
885 | if l: | |
886 | m = max(map(len, l)) |
|
886 | m = max(map(len, l)) | |
887 | pieces.append(["%*s" % (m, x) for x in l]) |
|
887 | pieces.append(["%*s" % (m, x) for x in l]) | |
888 |
|
888 | |||
889 | if pieces: |
|
889 | if pieces: | |
890 | for p, l in zip(zip(*pieces), lines): |
|
890 | for p, l in zip(zip(*pieces), lines): | |
891 | ui.write("%s: %s" % (" ".join(p), l[1])) |
|
891 | ui.write("%s: %s" % (" ".join(p), l[1])) | |
892 |
|
892 | |||
893 | def archive(ui, repo, dest, **opts): |
|
893 | def archive(ui, repo, dest, **opts): | |
894 | '''create unversioned archive of a repository revision |
|
894 | '''create unversioned archive of a repository revision | |
895 |
|
895 | |||
896 | By default, the revision used is the parent of the working |
|
896 | By default, the revision used is the parent of the working | |
897 | directory; use "-r" to specify a different revision. |
|
897 | directory; use "-r" to specify a different revision. | |
898 |
|
898 | |||
899 | To specify the type of archive to create, use "-t". Valid |
|
899 | To specify the type of archive to create, use "-t". Valid | |
900 | types are: |
|
900 | types are: | |
901 |
|
901 | |||
902 | "files" (default): a directory full of files |
|
902 | "files" (default): a directory full of files | |
903 | "tar": tar archive, uncompressed |
|
903 | "tar": tar archive, uncompressed | |
904 | "tbz2": tar archive, compressed using bzip2 |
|
904 | "tbz2": tar archive, compressed using bzip2 | |
905 | "tgz": tar archive, compressed using gzip |
|
905 | "tgz": tar archive, compressed using gzip | |
906 | "uzip": zip archive, uncompressed |
|
906 | "uzip": zip archive, uncompressed | |
907 | "zip": zip archive, compressed using deflate |
|
907 | "zip": zip archive, compressed using deflate | |
908 |
|
908 | |||
909 | The exact name of the destination archive or directory is given |
|
909 | The exact name of the destination archive or directory is given | |
910 | using a format string; see "hg help export" for details. |
|
910 | using a format string; see "hg help export" for details. | |
911 |
|
911 | |||
912 | Each member added to an archive file has a directory prefix |
|
912 | Each member added to an archive file has a directory prefix | |
913 | prepended. Use "-p" to specify a format string for the prefix. |
|
913 | prepended. Use "-p" to specify a format string for the prefix. | |
914 | The default is the basename of the archive, with suffixes removed. |
|
914 | The default is the basename of the archive, with suffixes removed. | |
915 | ''' |
|
915 | ''' | |
916 |
|
916 | |||
917 | if opts['rev']: |
|
917 | if opts['rev']: | |
918 | node = repo.lookup(opts['rev']) |
|
918 | node = repo.lookup(opts['rev']) | |
919 | else: |
|
919 | else: | |
920 | node, p2 = repo.dirstate.parents() |
|
920 | node, p2 = repo.dirstate.parents() | |
921 | if p2 != nullid: |
|
921 | if p2 != nullid: | |
922 | raise util.Abort(_('uncommitted merge - please provide a ' |
|
922 | raise util.Abort(_('uncommitted merge - please provide a ' | |
923 | 'specific revision')) |
|
923 | 'specific revision')) | |
924 |
|
924 | |||
925 | dest = make_filename(repo, dest, node) |
|
925 | dest = make_filename(repo, dest, node) | |
926 | if os.path.realpath(dest) == repo.root: |
|
926 | if os.path.realpath(dest) == repo.root: | |
927 | raise util.Abort(_('repository root cannot be destination')) |
|
927 | raise util.Abort(_('repository root cannot be destination')) | |
928 | dummy, matchfn, dummy = matchpats(repo, [], opts) |
|
928 | dummy, matchfn, dummy = matchpats(repo, [], opts) | |
929 | kind = opts.get('type') or 'files' |
|
929 | kind = opts.get('type') or 'files' | |
930 | prefix = opts['prefix'] |
|
930 | prefix = opts['prefix'] | |
931 | if dest == '-': |
|
931 | if dest == '-': | |
932 | if kind == 'files': |
|
932 | if kind == 'files': | |
933 | raise util.Abort(_('cannot archive plain files to stdout')) |
|
933 | raise util.Abort(_('cannot archive plain files to stdout')) | |
934 | dest = sys.stdout |
|
934 | dest = sys.stdout | |
935 | if not prefix: prefix = os.path.basename(repo.root) + '-%h' |
|
935 | if not prefix: prefix = os.path.basename(repo.root) + '-%h' | |
936 | prefix = make_filename(repo, prefix, node) |
|
936 | prefix = make_filename(repo, prefix, node) | |
937 | archival.archive(repo, dest, node, kind, not opts['no_decode'], |
|
937 | archival.archive(repo, dest, node, kind, not opts['no_decode'], | |
938 | matchfn, prefix) |
|
938 | matchfn, prefix) | |
939 |
|
939 | |||
940 | def backout(ui, repo, rev, **opts): |
|
940 | def backout(ui, repo, rev, **opts): | |
941 | '''reverse effect of earlier changeset |
|
941 | '''reverse effect of earlier changeset | |
942 |
|
942 | |||
943 | Commit the backed out changes as a new changeset. The new |
|
943 | Commit the backed out changes as a new changeset. The new | |
944 | changeset is a child of the backed out changeset. |
|
944 | changeset is a child of the backed out changeset. | |
945 |
|
945 | |||
946 | If you back out a changeset other than the tip, a new head is |
|
946 | If you back out a changeset other than the tip, a new head is | |
947 | created. This head is the parent of the working directory. If |
|
947 | created. This head is the parent of the working directory. If | |
948 | you back out an old changeset, your working directory will appear |
|
948 | you back out an old changeset, your working directory will appear | |
949 | old after the backout. You should merge the backout changeset |
|
949 | old after the backout. You should merge the backout changeset | |
950 | with another head. |
|
950 | with another head. | |
951 |
|
951 | |||
952 | The --merge option remembers the parent of the working directory |
|
952 | The --merge option remembers the parent of the working directory | |
953 | before starting the backout, then merges the new head with that |
|
953 | before starting the backout, then merges the new head with that | |
954 | changeset afterwards. This saves you from doing the merge by |
|
954 | changeset afterwards. This saves you from doing the merge by | |
955 | hand. The result of this merge is not committed, as for a normal |
|
955 | hand. The result of this merge is not committed, as for a normal | |
956 | merge.''' |
|
956 | merge.''' | |
957 |
|
957 | |||
958 | bail_if_changed(repo) |
|
958 | bail_if_changed(repo) | |
959 | op1, op2 = repo.dirstate.parents() |
|
959 | op1, op2 = repo.dirstate.parents() | |
960 | if op2 != nullid: |
|
960 | if op2 != nullid: | |
961 | raise util.Abort(_('outstanding uncommitted merge')) |
|
961 | raise util.Abort(_('outstanding uncommitted merge')) | |
962 | node = repo.lookup(rev) |
|
962 | node = repo.lookup(rev) | |
963 | p1, p2 = repo.changelog.parents(node) |
|
963 | p1, p2 = repo.changelog.parents(node) | |
964 | if p1 == nullid: |
|
964 | if p1 == nullid: | |
965 | raise util.Abort(_('cannot back out a change with no parents')) |
|
965 | raise util.Abort(_('cannot back out a change with no parents')) | |
966 | if p2 != nullid: |
|
966 | if p2 != nullid: | |
967 | if not opts['parent']: |
|
967 | if not opts['parent']: | |
968 | raise util.Abort(_('cannot back out a merge changeset without ' |
|
968 | raise util.Abort(_('cannot back out a merge changeset without ' | |
969 | '--parent')) |
|
969 | '--parent')) | |
970 | p = repo.lookup(opts['parent']) |
|
970 | p = repo.lookup(opts['parent']) | |
971 | if p not in (p1, p2): |
|
971 | if p not in (p1, p2): | |
972 | raise util.Abort(_('%s is not a parent of %s' % |
|
972 | raise util.Abort(_('%s is not a parent of %s' % | |
973 | (short(p), short(node)))) |
|
973 | (short(p), short(node)))) | |
974 | parent = p |
|
974 | parent = p | |
975 | else: |
|
975 | else: | |
976 | if opts['parent']: |
|
976 | if opts['parent']: | |
977 | raise util.Abort(_('cannot use --parent on non-merge changeset')) |
|
977 | raise util.Abort(_('cannot use --parent on non-merge changeset')) | |
978 | parent = p1 |
|
978 | parent = p1 | |
979 |
hg. |
|
979 | hg.clean(repo, node, show_stats=False) | |
980 | revert_opts = opts.copy() |
|
980 | revert_opts = opts.copy() | |
981 | revert_opts['rev'] = hex(parent) |
|
981 | revert_opts['rev'] = hex(parent) | |
982 | revert(ui, repo, **revert_opts) |
|
982 | revert(ui, repo, **revert_opts) | |
983 | commit_opts = opts.copy() |
|
983 | commit_opts = opts.copy() | |
984 | commit_opts['addremove'] = False |
|
984 | commit_opts['addremove'] = False | |
985 | if not commit_opts['message'] and not commit_opts['logfile']: |
|
985 | if not commit_opts['message'] and not commit_opts['logfile']: | |
986 | commit_opts['message'] = _("Backed out changeset %s") % (hex(node)) |
|
986 | commit_opts['message'] = _("Backed out changeset %s") % (hex(node)) | |
987 | commit_opts['force_editor'] = True |
|
987 | commit_opts['force_editor'] = True | |
988 | commit(ui, repo, **commit_opts) |
|
988 | commit(ui, repo, **commit_opts) | |
989 | def nice(node): |
|
989 | def nice(node): | |
990 | return '%d:%s' % (repo.changelog.rev(node), short(node)) |
|
990 | return '%d:%s' % (repo.changelog.rev(node), short(node)) | |
991 | ui.status(_('changeset %s backs out changeset %s\n') % |
|
991 | ui.status(_('changeset %s backs out changeset %s\n') % | |
992 | (nice(repo.changelog.tip()), nice(node))) |
|
992 | (nice(repo.changelog.tip()), nice(node))) | |
993 | if op1 != node: |
|
993 | if op1 != node: | |
994 | if opts['merge']: |
|
994 | if opts['merge']: | |
995 | ui.status(_('merging with changeset %s\n') % nice(op1)) |
|
995 | ui.status(_('merging with changeset %s\n') % nice(op1)) | |
996 | n = _lookup(repo, hex(op1)) |
|
996 | n = _lookup(repo, hex(op1)) | |
997 |
hg. |
|
997 | hg.merge(repo, n) | |
998 | else: |
|
998 | else: | |
999 | ui.status(_('the backout changeset is a new head - ' |
|
999 | ui.status(_('the backout changeset is a new head - ' | |
1000 | 'do not forget to merge\n')) |
|
1000 | 'do not forget to merge\n')) | |
1001 | ui.status(_('(use "backout --merge" ' |
|
1001 | ui.status(_('(use "backout --merge" ' | |
1002 | 'if you want to auto-merge)\n')) |
|
1002 | 'if you want to auto-merge)\n')) | |
1003 |
|
1003 | |||
1004 | def bundle(ui, repo, fname, dest=None, **opts): |
|
1004 | def bundle(ui, repo, fname, dest=None, **opts): | |
1005 | """create a changegroup file |
|
1005 | """create a changegroup file | |
1006 |
|
1006 | |||
1007 | Generate a compressed changegroup file collecting all changesets |
|
1007 | Generate a compressed changegroup file collecting all changesets | |
1008 | not found in the other repository. |
|
1008 | not found in the other repository. | |
1009 |
|
1009 | |||
1010 | This file can then be transferred using conventional means and |
|
1010 | This file can then be transferred using conventional means and | |
1011 | applied to another repository with the unbundle command. This is |
|
1011 | applied to another repository with the unbundle command. This is | |
1012 | useful when native push and pull are not available or when |
|
1012 | useful when native push and pull are not available or when | |
1013 | exporting an entire repository is undesirable. The standard file |
|
1013 | exporting an entire repository is undesirable. The standard file | |
1014 | extension is ".hg". |
|
1014 | extension is ".hg". | |
1015 |
|
1015 | |||
1016 | Unlike import/export, this exactly preserves all changeset |
|
1016 | Unlike import/export, this exactly preserves all changeset | |
1017 | contents including permissions, rename data, and revision history. |
|
1017 | contents including permissions, rename data, and revision history. | |
1018 | """ |
|
1018 | """ | |
1019 | dest = ui.expandpath(dest or 'default-push', dest or 'default') |
|
1019 | dest = ui.expandpath(dest or 'default-push', dest or 'default') | |
1020 | other = hg.repository(ui, dest) |
|
1020 | other = hg.repository(ui, dest) | |
1021 | o = repo.findoutgoing(other, force=opts['force']) |
|
1021 | o = repo.findoutgoing(other, force=opts['force']) | |
1022 | cg = repo.changegroup(o, 'bundle') |
|
1022 | cg = repo.changegroup(o, 'bundle') | |
1023 | write_bundle(cg, fname) |
|
1023 | write_bundle(cg, fname) | |
1024 |
|
1024 | |||
1025 | def cat(ui, repo, file1, *pats, **opts): |
|
1025 | def cat(ui, repo, file1, *pats, **opts): | |
1026 | """output the latest or given revisions of files |
|
1026 | """output the latest or given revisions of files | |
1027 |
|
1027 | |||
1028 | Print the specified files as they were at the given revision. |
|
1028 | Print the specified files as they were at the given revision. | |
1029 | If no revision is given then the tip is used. |
|
1029 | If no revision is given then the tip is used. | |
1030 |
|
1030 | |||
1031 | Output may be to a file, in which case the name of the file is |
|
1031 | Output may be to a file, in which case the name of the file is | |
1032 | given using a format string. The formatting rules are the same as |
|
1032 | given using a format string. The formatting rules are the same as | |
1033 | for the export command, with the following additions: |
|
1033 | for the export command, with the following additions: | |
1034 |
|
1034 | |||
1035 | %s basename of file being printed |
|
1035 | %s basename of file being printed | |
1036 | %d dirname of file being printed, or '.' if in repo root |
|
1036 | %d dirname of file being printed, or '.' if in repo root | |
1037 | %p root-relative path name of file being printed |
|
1037 | %p root-relative path name of file being printed | |
1038 | """ |
|
1038 | """ | |
1039 | ctx = repo.changectx(opts['rev'] or "-1") |
|
1039 | ctx = repo.changectx(opts['rev'] or "-1") | |
1040 | for src, abs, rel, exact in walk(repo, (file1,) + pats, opts, ctx.node()): |
|
1040 | for src, abs, rel, exact in walk(repo, (file1,) + pats, opts, ctx.node()): | |
1041 | fp = make_file(repo, opts['output'], ctx.node(), pathname=abs) |
|
1041 | fp = make_file(repo, opts['output'], ctx.node(), pathname=abs) | |
1042 | fp.write(ctx.filectx(abs).data()) |
|
1042 | fp.write(ctx.filectx(abs).data()) | |
1043 |
|
1043 | |||
1044 | def clone(ui, source, dest=None, **opts): |
|
1044 | def clone(ui, source, dest=None, **opts): | |
1045 | """make a copy of an existing repository |
|
1045 | """make a copy of an existing repository | |
1046 |
|
1046 | |||
1047 | Create a copy of an existing repository in a new directory. |
|
1047 | Create a copy of an existing repository in a new directory. | |
1048 |
|
1048 | |||
1049 | If no destination directory name is specified, it defaults to the |
|
1049 | If no destination directory name is specified, it defaults to the | |
1050 | basename of the source. |
|
1050 | basename of the source. | |
1051 |
|
1051 | |||
1052 | The location of the source is added to the new repository's |
|
1052 | The location of the source is added to the new repository's | |
1053 | .hg/hgrc file, as the default to be used for future pulls. |
|
1053 | .hg/hgrc file, as the default to be used for future pulls. | |
1054 |
|
1054 | |||
1055 | For efficiency, hardlinks are used for cloning whenever the source |
|
1055 | For efficiency, hardlinks are used for cloning whenever the source | |
1056 | and destination are on the same filesystem (note this applies only |
|
1056 | and destination are on the same filesystem (note this applies only | |
1057 | to the repository data, not to the checked out files). Some |
|
1057 | to the repository data, not to the checked out files). Some | |
1058 | filesystems, such as AFS, implement hardlinking incorrectly, but |
|
1058 | filesystems, such as AFS, implement hardlinking incorrectly, but | |
1059 | do not report errors. In these cases, use the --pull option to |
|
1059 | do not report errors. In these cases, use the --pull option to | |
1060 | avoid hardlinking. |
|
1060 | avoid hardlinking. | |
1061 |
|
1061 | |||
1062 | You can safely clone repositories and checked out files using full |
|
1062 | You can safely clone repositories and checked out files using full | |
1063 | hardlinks with |
|
1063 | hardlinks with | |
1064 |
|
1064 | |||
1065 | $ cp -al REPO REPOCLONE |
|
1065 | $ cp -al REPO REPOCLONE | |
1066 |
|
1066 | |||
1067 | which is the fastest way to clone. However, the operation is not |
|
1067 | which is the fastest way to clone. However, the operation is not | |
1068 | atomic (making sure REPO is not modified during the operation is |
|
1068 | atomic (making sure REPO is not modified during the operation is | |
1069 | up to you) and you have to make sure your editor breaks hardlinks |
|
1069 | up to you) and you have to make sure your editor breaks hardlinks | |
1070 | (Emacs and most Linux Kernel tools do so). |
|
1070 | (Emacs and most Linux Kernel tools do so). | |
1071 |
|
1071 | |||
1072 | If you use the -r option to clone up to a specific revision, no |
|
1072 | If you use the -r option to clone up to a specific revision, no | |
1073 | subsequent revisions will be present in the cloned repository. |
|
1073 | subsequent revisions will be present in the cloned repository. | |
1074 | This option implies --pull, even on local repositories. |
|
1074 | This option implies --pull, even on local repositories. | |
1075 |
|
1075 | |||
1076 | See pull for valid source format details. |
|
1076 | See pull for valid source format details. | |
1077 |
|
1077 | |||
1078 | It is possible to specify an ssh:// URL as the destination, but no |
|
1078 | It is possible to specify an ssh:// URL as the destination, but no | |
1079 | .hg/hgrc will be created on the remote side. Look at the help text |
|
1079 | .hg/hgrc will be created on the remote side. Look at the help text | |
1080 | for the pull command for important details about ssh:// URLs. |
|
1080 | for the pull command for important details about ssh:// URLs. | |
1081 | """ |
|
1081 | """ | |
1082 | setremoteconfig(ui, opts) |
|
1082 | setremoteconfig(ui, opts) | |
1083 | hg.clone(ui, ui.expandpath(source), dest, |
|
1083 | hg.clone(ui, ui.expandpath(source), dest, | |
1084 | pull=opts['pull'], |
|
1084 | pull=opts['pull'], | |
1085 | stream=opts['uncompressed'], |
|
1085 | stream=opts['uncompressed'], | |
1086 | rev=opts['rev'], |
|
1086 | rev=opts['rev'], | |
1087 | update=not opts['noupdate']) |
|
1087 | update=not opts['noupdate']) | |
1088 |
|
1088 | |||
1089 | def commit(ui, repo, *pats, **opts): |
|
1089 | def commit(ui, repo, *pats, **opts): | |
1090 | """commit the specified files or all outstanding changes |
|
1090 | """commit the specified files or all outstanding changes | |
1091 |
|
1091 | |||
1092 | Commit changes to the given files into the repository. |
|
1092 | Commit changes to the given files into the repository. | |
1093 |
|
1093 | |||
1094 | If a list of files is omitted, all changes reported by "hg status" |
|
1094 | If a list of files is omitted, all changes reported by "hg status" | |
1095 | will be committed. |
|
1095 | will be committed. | |
1096 |
|
1096 | |||
1097 | If no commit message is specified, the editor configured in your hgrc |
|
1097 | If no commit message is specified, the editor configured in your hgrc | |
1098 | or in the EDITOR environment variable is started to enter a message. |
|
1098 | or in the EDITOR environment variable is started to enter a message. | |
1099 | """ |
|
1099 | """ | |
1100 | message = logmessage(opts) |
|
1100 | message = logmessage(opts) | |
1101 |
|
1101 | |||
1102 | if opts['addremove']: |
|
1102 | if opts['addremove']: | |
1103 | addremove_lock(ui, repo, pats, opts) |
|
1103 | addremove_lock(ui, repo, pats, opts) | |
1104 | fns, match, anypats = matchpats(repo, pats, opts) |
|
1104 | fns, match, anypats = matchpats(repo, pats, opts) | |
1105 | if pats: |
|
1105 | if pats: | |
1106 | modified, added, removed, deleted, unknown = ( |
|
1106 | modified, added, removed, deleted, unknown = ( | |
1107 | repo.changes(files=fns, match=match)) |
|
1107 | repo.changes(files=fns, match=match)) | |
1108 | files = modified + added + removed |
|
1108 | files = modified + added + removed | |
1109 | else: |
|
1109 | else: | |
1110 | files = [] |
|
1110 | files = [] | |
1111 | try: |
|
1111 | try: | |
1112 | repo.commit(files, message, opts['user'], opts['date'], match, |
|
1112 | repo.commit(files, message, opts['user'], opts['date'], match, | |
1113 | force_editor=opts.get('force_editor')) |
|
1113 | force_editor=opts.get('force_editor')) | |
1114 | except ValueError, inst: |
|
1114 | except ValueError, inst: | |
1115 | raise util.Abort(str(inst)) |
|
1115 | raise util.Abort(str(inst)) | |
1116 |
|
1116 | |||
1117 | def docopy(ui, repo, pats, opts, wlock): |
|
1117 | def docopy(ui, repo, pats, opts, wlock): | |
1118 | # called with the repo lock held |
|
1118 | # called with the repo lock held | |
1119 | cwd = repo.getcwd() |
|
1119 | cwd = repo.getcwd() | |
1120 | errors = 0 |
|
1120 | errors = 0 | |
1121 | copied = [] |
|
1121 | copied = [] | |
1122 | targets = {} |
|
1122 | targets = {} | |
1123 |
|
1123 | |||
1124 | def okaytocopy(abs, rel, exact): |
|
1124 | def okaytocopy(abs, rel, exact): | |
1125 | reasons = {'?': _('is not managed'), |
|
1125 | reasons = {'?': _('is not managed'), | |
1126 | 'a': _('has been marked for add'), |
|
1126 | 'a': _('has been marked for add'), | |
1127 | 'r': _('has been marked for remove')} |
|
1127 | 'r': _('has been marked for remove')} | |
1128 | state = repo.dirstate.state(abs) |
|
1128 | state = repo.dirstate.state(abs) | |
1129 | reason = reasons.get(state) |
|
1129 | reason = reasons.get(state) | |
1130 | if reason: |
|
1130 | if reason: | |
1131 | if state == 'a': |
|
1131 | if state == 'a': | |
1132 | origsrc = repo.dirstate.copied(abs) |
|
1132 | origsrc = repo.dirstate.copied(abs) | |
1133 | if origsrc is not None: |
|
1133 | if origsrc is not None: | |
1134 | return origsrc |
|
1134 | return origsrc | |
1135 | if exact: |
|
1135 | if exact: | |
1136 | ui.warn(_('%s: not copying - file %s\n') % (rel, reason)) |
|
1136 | ui.warn(_('%s: not copying - file %s\n') % (rel, reason)) | |
1137 | else: |
|
1137 | else: | |
1138 | return abs |
|
1138 | return abs | |
1139 |
|
1139 | |||
1140 | def copy(origsrc, abssrc, relsrc, target, exact): |
|
1140 | def copy(origsrc, abssrc, relsrc, target, exact): | |
1141 | abstarget = util.canonpath(repo.root, cwd, target) |
|
1141 | abstarget = util.canonpath(repo.root, cwd, target) | |
1142 | reltarget = util.pathto(cwd, abstarget) |
|
1142 | reltarget = util.pathto(cwd, abstarget) | |
1143 | prevsrc = targets.get(abstarget) |
|
1143 | prevsrc = targets.get(abstarget) | |
1144 | if prevsrc is not None: |
|
1144 | if prevsrc is not None: | |
1145 | ui.warn(_('%s: not overwriting - %s collides with %s\n') % |
|
1145 | ui.warn(_('%s: not overwriting - %s collides with %s\n') % | |
1146 | (reltarget, abssrc, prevsrc)) |
|
1146 | (reltarget, abssrc, prevsrc)) | |
1147 | return |
|
1147 | return | |
1148 | if (not opts['after'] and os.path.exists(reltarget) or |
|
1148 | if (not opts['after'] and os.path.exists(reltarget) or | |
1149 | opts['after'] and repo.dirstate.state(abstarget) not in '?r'): |
|
1149 | opts['after'] and repo.dirstate.state(abstarget) not in '?r'): | |
1150 | if not opts['force']: |
|
1150 | if not opts['force']: | |
1151 | ui.warn(_('%s: not overwriting - file exists\n') % |
|
1151 | ui.warn(_('%s: not overwriting - file exists\n') % | |
1152 | reltarget) |
|
1152 | reltarget) | |
1153 | return |
|
1153 | return | |
1154 | if not opts['after'] and not opts.get('dry_run'): |
|
1154 | if not opts['after'] and not opts.get('dry_run'): | |
1155 | os.unlink(reltarget) |
|
1155 | os.unlink(reltarget) | |
1156 | if opts['after']: |
|
1156 | if opts['after']: | |
1157 | if not os.path.exists(reltarget): |
|
1157 | if not os.path.exists(reltarget): | |
1158 | return |
|
1158 | return | |
1159 | else: |
|
1159 | else: | |
1160 | targetdir = os.path.dirname(reltarget) or '.' |
|
1160 | targetdir = os.path.dirname(reltarget) or '.' | |
1161 | if not os.path.isdir(targetdir) and not opts.get('dry_run'): |
|
1161 | if not os.path.isdir(targetdir) and not opts.get('dry_run'): | |
1162 | os.makedirs(targetdir) |
|
1162 | os.makedirs(targetdir) | |
1163 | try: |
|
1163 | try: | |
1164 | restore = repo.dirstate.state(abstarget) == 'r' |
|
1164 | restore = repo.dirstate.state(abstarget) == 'r' | |
1165 | if restore and not opts.get('dry_run'): |
|
1165 | if restore and not opts.get('dry_run'): | |
1166 | repo.undelete([abstarget], wlock) |
|
1166 | repo.undelete([abstarget], wlock) | |
1167 | try: |
|
1167 | try: | |
1168 | if not opts.get('dry_run'): |
|
1168 | if not opts.get('dry_run'): | |
1169 | shutil.copyfile(relsrc, reltarget) |
|
1169 | shutil.copyfile(relsrc, reltarget) | |
1170 | shutil.copymode(relsrc, reltarget) |
|
1170 | shutil.copymode(relsrc, reltarget) | |
1171 | restore = False |
|
1171 | restore = False | |
1172 | finally: |
|
1172 | finally: | |
1173 | if restore: |
|
1173 | if restore: | |
1174 | repo.remove([abstarget], wlock) |
|
1174 | repo.remove([abstarget], wlock) | |
1175 | except shutil.Error, inst: |
|
1175 | except shutil.Error, inst: | |
1176 | raise util.Abort(str(inst)) |
|
1176 | raise util.Abort(str(inst)) | |
1177 | except IOError, inst: |
|
1177 | except IOError, inst: | |
1178 | if inst.errno == errno.ENOENT: |
|
1178 | if inst.errno == errno.ENOENT: | |
1179 | ui.warn(_('%s: deleted in working copy\n') % relsrc) |
|
1179 | ui.warn(_('%s: deleted in working copy\n') % relsrc) | |
1180 | else: |
|
1180 | else: | |
1181 | ui.warn(_('%s: cannot copy - %s\n') % |
|
1181 | ui.warn(_('%s: cannot copy - %s\n') % | |
1182 | (relsrc, inst.strerror)) |
|
1182 | (relsrc, inst.strerror)) | |
1183 | errors += 1 |
|
1183 | errors += 1 | |
1184 | return |
|
1184 | return | |
1185 | if ui.verbose or not exact: |
|
1185 | if ui.verbose or not exact: | |
1186 | ui.status(_('copying %s to %s\n') % (relsrc, reltarget)) |
|
1186 | ui.status(_('copying %s to %s\n') % (relsrc, reltarget)) | |
1187 | targets[abstarget] = abssrc |
|
1187 | targets[abstarget] = abssrc | |
1188 | if abstarget != origsrc and not opts.get('dry_run'): |
|
1188 | if abstarget != origsrc and not opts.get('dry_run'): | |
1189 | repo.copy(origsrc, abstarget, wlock) |
|
1189 | repo.copy(origsrc, abstarget, wlock) | |
1190 | copied.append((abssrc, relsrc, exact)) |
|
1190 | copied.append((abssrc, relsrc, exact)) | |
1191 |
|
1191 | |||
1192 | def targetpathfn(pat, dest, srcs): |
|
1192 | def targetpathfn(pat, dest, srcs): | |
1193 | if os.path.isdir(pat): |
|
1193 | if os.path.isdir(pat): | |
1194 | abspfx = util.canonpath(repo.root, cwd, pat) |
|
1194 | abspfx = util.canonpath(repo.root, cwd, pat) | |
1195 | if destdirexists: |
|
1195 | if destdirexists: | |
1196 | striplen = len(os.path.split(abspfx)[0]) |
|
1196 | striplen = len(os.path.split(abspfx)[0]) | |
1197 | else: |
|
1197 | else: | |
1198 | striplen = len(abspfx) |
|
1198 | striplen = len(abspfx) | |
1199 | if striplen: |
|
1199 | if striplen: | |
1200 | striplen += len(os.sep) |
|
1200 | striplen += len(os.sep) | |
1201 | res = lambda p: os.path.join(dest, p[striplen:]) |
|
1201 | res = lambda p: os.path.join(dest, p[striplen:]) | |
1202 | elif destdirexists: |
|
1202 | elif destdirexists: | |
1203 | res = lambda p: os.path.join(dest, os.path.basename(p)) |
|
1203 | res = lambda p: os.path.join(dest, os.path.basename(p)) | |
1204 | else: |
|
1204 | else: | |
1205 | res = lambda p: dest |
|
1205 | res = lambda p: dest | |
1206 | return res |
|
1206 | return res | |
1207 |
|
1207 | |||
1208 | def targetpathafterfn(pat, dest, srcs): |
|
1208 | def targetpathafterfn(pat, dest, srcs): | |
1209 | if util.patkind(pat, None)[0]: |
|
1209 | if util.patkind(pat, None)[0]: | |
1210 | # a mercurial pattern |
|
1210 | # a mercurial pattern | |
1211 | res = lambda p: os.path.join(dest, os.path.basename(p)) |
|
1211 | res = lambda p: os.path.join(dest, os.path.basename(p)) | |
1212 | else: |
|
1212 | else: | |
1213 | abspfx = util.canonpath(repo.root, cwd, pat) |
|
1213 | abspfx = util.canonpath(repo.root, cwd, pat) | |
1214 | if len(abspfx) < len(srcs[0][0]): |
|
1214 | if len(abspfx) < len(srcs[0][0]): | |
1215 | # A directory. Either the target path contains the last |
|
1215 | # A directory. Either the target path contains the last | |
1216 | # component of the source path or it does not. |
|
1216 | # component of the source path or it does not. | |
1217 | def evalpath(striplen): |
|
1217 | def evalpath(striplen): | |
1218 | score = 0 |
|
1218 | score = 0 | |
1219 | for s in srcs: |
|
1219 | for s in srcs: | |
1220 | t = os.path.join(dest, s[0][striplen:]) |
|
1220 | t = os.path.join(dest, s[0][striplen:]) | |
1221 | if os.path.exists(t): |
|
1221 | if os.path.exists(t): | |
1222 | score += 1 |
|
1222 | score += 1 | |
1223 | return score |
|
1223 | return score | |
1224 |
|
1224 | |||
1225 | striplen = len(abspfx) |
|
1225 | striplen = len(abspfx) | |
1226 | if striplen: |
|
1226 | if striplen: | |
1227 | striplen += len(os.sep) |
|
1227 | striplen += len(os.sep) | |
1228 | if os.path.isdir(os.path.join(dest, os.path.split(abspfx)[1])): |
|
1228 | if os.path.isdir(os.path.join(dest, os.path.split(abspfx)[1])): | |
1229 | score = evalpath(striplen) |
|
1229 | score = evalpath(striplen) | |
1230 | striplen1 = len(os.path.split(abspfx)[0]) |
|
1230 | striplen1 = len(os.path.split(abspfx)[0]) | |
1231 | if striplen1: |
|
1231 | if striplen1: | |
1232 | striplen1 += len(os.sep) |
|
1232 | striplen1 += len(os.sep) | |
1233 | if evalpath(striplen1) > score: |
|
1233 | if evalpath(striplen1) > score: | |
1234 | striplen = striplen1 |
|
1234 | striplen = striplen1 | |
1235 | res = lambda p: os.path.join(dest, p[striplen:]) |
|
1235 | res = lambda p: os.path.join(dest, p[striplen:]) | |
1236 | else: |
|
1236 | else: | |
1237 | # a file |
|
1237 | # a file | |
1238 | if destdirexists: |
|
1238 | if destdirexists: | |
1239 | res = lambda p: os.path.join(dest, os.path.basename(p)) |
|
1239 | res = lambda p: os.path.join(dest, os.path.basename(p)) | |
1240 | else: |
|
1240 | else: | |
1241 | res = lambda p: dest |
|
1241 | res = lambda p: dest | |
1242 | return res |
|
1242 | return res | |
1243 |
|
1243 | |||
1244 |
|
1244 | |||
1245 | pats = list(pats) |
|
1245 | pats = list(pats) | |
1246 | if not pats: |
|
1246 | if not pats: | |
1247 | raise util.Abort(_('no source or destination specified')) |
|
1247 | raise util.Abort(_('no source or destination specified')) | |
1248 | if len(pats) == 1: |
|
1248 | if len(pats) == 1: | |
1249 | raise util.Abort(_('no destination specified')) |
|
1249 | raise util.Abort(_('no destination specified')) | |
1250 | dest = pats.pop() |
|
1250 | dest = pats.pop() | |
1251 | destdirexists = os.path.isdir(dest) |
|
1251 | destdirexists = os.path.isdir(dest) | |
1252 | if (len(pats) > 1 or util.patkind(pats[0], None)[0]) and not destdirexists: |
|
1252 | if (len(pats) > 1 or util.patkind(pats[0], None)[0]) and not destdirexists: | |
1253 | raise util.Abort(_('with multiple sources, destination must be an ' |
|
1253 | raise util.Abort(_('with multiple sources, destination must be an ' | |
1254 | 'existing directory')) |
|
1254 | 'existing directory')) | |
1255 | if opts['after']: |
|
1255 | if opts['after']: | |
1256 | tfn = targetpathafterfn |
|
1256 | tfn = targetpathafterfn | |
1257 | else: |
|
1257 | else: | |
1258 | tfn = targetpathfn |
|
1258 | tfn = targetpathfn | |
1259 | copylist = [] |
|
1259 | copylist = [] | |
1260 | for pat in pats: |
|
1260 | for pat in pats: | |
1261 | srcs = [] |
|
1261 | srcs = [] | |
1262 | for tag, abssrc, relsrc, exact in walk(repo, [pat], opts): |
|
1262 | for tag, abssrc, relsrc, exact in walk(repo, [pat], opts): | |
1263 | origsrc = okaytocopy(abssrc, relsrc, exact) |
|
1263 | origsrc = okaytocopy(abssrc, relsrc, exact) | |
1264 | if origsrc: |
|
1264 | if origsrc: | |
1265 | srcs.append((origsrc, abssrc, relsrc, exact)) |
|
1265 | srcs.append((origsrc, abssrc, relsrc, exact)) | |
1266 | if not srcs: |
|
1266 | if not srcs: | |
1267 | continue |
|
1267 | continue | |
1268 | copylist.append((tfn(pat, dest, srcs), srcs)) |
|
1268 | copylist.append((tfn(pat, dest, srcs), srcs)) | |
1269 | if not copylist: |
|
1269 | if not copylist: | |
1270 | raise util.Abort(_('no files to copy')) |
|
1270 | raise util.Abort(_('no files to copy')) | |
1271 |
|
1271 | |||
1272 | for targetpath, srcs in copylist: |
|
1272 | for targetpath, srcs in copylist: | |
1273 | for origsrc, abssrc, relsrc, exact in srcs: |
|
1273 | for origsrc, abssrc, relsrc, exact in srcs: | |
1274 | copy(origsrc, abssrc, relsrc, targetpath(abssrc), exact) |
|
1274 | copy(origsrc, abssrc, relsrc, targetpath(abssrc), exact) | |
1275 |
|
1275 | |||
1276 | if errors: |
|
1276 | if errors: | |
1277 | ui.warn(_('(consider using --after)\n')) |
|
1277 | ui.warn(_('(consider using --after)\n')) | |
1278 | return errors, copied |
|
1278 | return errors, copied | |
1279 |
|
1279 | |||
1280 | def copy(ui, repo, *pats, **opts): |
|
1280 | def copy(ui, repo, *pats, **opts): | |
1281 | """mark files as copied for the next commit |
|
1281 | """mark files as copied for the next commit | |
1282 |
|
1282 | |||
1283 | Mark dest as having copies of source files. If dest is a |
|
1283 | Mark dest as having copies of source files. If dest is a | |
1284 | directory, copies are put in that directory. If dest is a file, |
|
1284 | directory, copies are put in that directory. If dest is a file, | |
1285 | there can only be one source. |
|
1285 | there can only be one source. | |
1286 |
|
1286 | |||
1287 | By default, this command copies the contents of files as they |
|
1287 | By default, this command copies the contents of files as they | |
1288 | stand in the working directory. If invoked with --after, the |
|
1288 | stand in the working directory. If invoked with --after, the | |
1289 | operation is recorded, but no copying is performed. |
|
1289 | operation is recorded, but no copying is performed. | |
1290 |
|
1290 | |||
1291 | This command takes effect in the next commit. |
|
1291 | This command takes effect in the next commit. | |
1292 |
|
1292 | |||
1293 | NOTE: This command should be treated as experimental. While it |
|
1293 | NOTE: This command should be treated as experimental. While it | |
1294 | should properly record copied files, this information is not yet |
|
1294 | should properly record copied files, this information is not yet | |
1295 | fully used by merge, nor fully reported by log. |
|
1295 | fully used by merge, nor fully reported by log. | |
1296 | """ |
|
1296 | """ | |
1297 | wlock = repo.wlock(0) |
|
1297 | wlock = repo.wlock(0) | |
1298 | errs, copied = docopy(ui, repo, pats, opts, wlock) |
|
1298 | errs, copied = docopy(ui, repo, pats, opts, wlock) | |
1299 | return errs |
|
1299 | return errs | |
1300 |
|
1300 | |||
1301 | def debugancestor(ui, index, rev1, rev2): |
|
1301 | def debugancestor(ui, index, rev1, rev2): | |
1302 | """find the ancestor revision of two revisions in a given index""" |
|
1302 | """find the ancestor revision of two revisions in a given index""" | |
1303 | r = revlog.revlog(util.opener(os.getcwd(), audit=False), index, "", 0) |
|
1303 | r = revlog.revlog(util.opener(os.getcwd(), audit=False), index, "", 0) | |
1304 | a = r.ancestor(r.lookup(rev1), r.lookup(rev2)) |
|
1304 | a = r.ancestor(r.lookup(rev1), r.lookup(rev2)) | |
1305 | ui.write("%d:%s\n" % (r.rev(a), hex(a))) |
|
1305 | ui.write("%d:%s\n" % (r.rev(a), hex(a))) | |
1306 |
|
1306 | |||
1307 | def debugcomplete(ui, cmd='', **opts): |
|
1307 | def debugcomplete(ui, cmd='', **opts): | |
1308 | """returns the completion list associated with the given command""" |
|
1308 | """returns the completion list associated with the given command""" | |
1309 |
|
1309 | |||
1310 | if opts['options']: |
|
1310 | if opts['options']: | |
1311 | options = [] |
|
1311 | options = [] | |
1312 | otables = [globalopts] |
|
1312 | otables = [globalopts] | |
1313 | if cmd: |
|
1313 | if cmd: | |
1314 | aliases, entry = findcmd(cmd) |
|
1314 | aliases, entry = findcmd(cmd) | |
1315 | otables.append(entry[1]) |
|
1315 | otables.append(entry[1]) | |
1316 | for t in otables: |
|
1316 | for t in otables: | |
1317 | for o in t: |
|
1317 | for o in t: | |
1318 | if o[0]: |
|
1318 | if o[0]: | |
1319 | options.append('-%s' % o[0]) |
|
1319 | options.append('-%s' % o[0]) | |
1320 | options.append('--%s' % o[1]) |
|
1320 | options.append('--%s' % o[1]) | |
1321 | ui.write("%s\n" % "\n".join(options)) |
|
1321 | ui.write("%s\n" % "\n".join(options)) | |
1322 | return |
|
1322 | return | |
1323 |
|
1323 | |||
1324 | clist = findpossible(cmd).keys() |
|
1324 | clist = findpossible(cmd).keys() | |
1325 | clist.sort() |
|
1325 | clist.sort() | |
1326 | ui.write("%s\n" % "\n".join(clist)) |
|
1326 | ui.write("%s\n" % "\n".join(clist)) | |
1327 |
|
1327 | |||
1328 | def debugrebuildstate(ui, repo, rev=None): |
|
1328 | def debugrebuildstate(ui, repo, rev=None): | |
1329 | """rebuild the dirstate as it would look like for the given revision""" |
|
1329 | """rebuild the dirstate as it would look like for the given revision""" | |
1330 | if not rev: |
|
1330 | if not rev: | |
1331 | rev = repo.changelog.tip() |
|
1331 | rev = repo.changelog.tip() | |
1332 | else: |
|
1332 | else: | |
1333 | rev = repo.lookup(rev) |
|
1333 | rev = repo.lookup(rev) | |
1334 | change = repo.changelog.read(rev) |
|
1334 | change = repo.changelog.read(rev) | |
1335 | n = change[0] |
|
1335 | n = change[0] | |
1336 | files = repo.manifest.readflags(n) |
|
1336 | files = repo.manifest.readflags(n) | |
1337 | wlock = repo.wlock() |
|
1337 | wlock = repo.wlock() | |
1338 | repo.dirstate.rebuild(rev, files.iteritems()) |
|
1338 | repo.dirstate.rebuild(rev, files.iteritems()) | |
1339 |
|
1339 | |||
1340 | def debugcheckstate(ui, repo): |
|
1340 | def debugcheckstate(ui, repo): | |
1341 | """validate the correctness of the current dirstate""" |
|
1341 | """validate the correctness of the current dirstate""" | |
1342 | parent1, parent2 = repo.dirstate.parents() |
|
1342 | parent1, parent2 = repo.dirstate.parents() | |
1343 | repo.dirstate.read() |
|
1343 | repo.dirstate.read() | |
1344 | dc = repo.dirstate.map |
|
1344 | dc = repo.dirstate.map | |
1345 | keys = dc.keys() |
|
1345 | keys = dc.keys() | |
1346 | keys.sort() |
|
1346 | keys.sort() | |
1347 | m1n = repo.changelog.read(parent1)[0] |
|
1347 | m1n = repo.changelog.read(parent1)[0] | |
1348 | m2n = repo.changelog.read(parent2)[0] |
|
1348 | m2n = repo.changelog.read(parent2)[0] | |
1349 | m1 = repo.manifest.read(m1n) |
|
1349 | m1 = repo.manifest.read(m1n) | |
1350 | m2 = repo.manifest.read(m2n) |
|
1350 | m2 = repo.manifest.read(m2n) | |
1351 | errors = 0 |
|
1351 | errors = 0 | |
1352 | for f in dc: |
|
1352 | for f in dc: | |
1353 | state = repo.dirstate.state(f) |
|
1353 | state = repo.dirstate.state(f) | |
1354 | if state in "nr" and f not in m1: |
|
1354 | if state in "nr" and f not in m1: | |
1355 | ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state)) |
|
1355 | ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state)) | |
1356 | errors += 1 |
|
1356 | errors += 1 | |
1357 | if state in "a" and f in m1: |
|
1357 | if state in "a" and f in m1: | |
1358 | ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state)) |
|
1358 | ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state)) | |
1359 | errors += 1 |
|
1359 | errors += 1 | |
1360 | if state in "m" and f not in m1 and f not in m2: |
|
1360 | if state in "m" and f not in m1 and f not in m2: | |
1361 | ui.warn(_("%s in state %s, but not in either manifest\n") % |
|
1361 | ui.warn(_("%s in state %s, but not in either manifest\n") % | |
1362 | (f, state)) |
|
1362 | (f, state)) | |
1363 | errors += 1 |
|
1363 | errors += 1 | |
1364 | for f in m1: |
|
1364 | for f in m1: | |
1365 | state = repo.dirstate.state(f) |
|
1365 | state = repo.dirstate.state(f) | |
1366 | if state not in "nrm": |
|
1366 | if state not in "nrm": | |
1367 | ui.warn(_("%s in manifest1, but listed as state %s") % (f, state)) |
|
1367 | ui.warn(_("%s in manifest1, but listed as state %s") % (f, state)) | |
1368 | errors += 1 |
|
1368 | errors += 1 | |
1369 | if errors: |
|
1369 | if errors: | |
1370 | error = _(".hg/dirstate inconsistent with current parent's manifest") |
|
1370 | error = _(".hg/dirstate inconsistent with current parent's manifest") | |
1371 | raise util.Abort(error) |
|
1371 | raise util.Abort(error) | |
1372 |
|
1372 | |||
1373 | def debugconfig(ui, repo, *values): |
|
1373 | def debugconfig(ui, repo, *values): | |
1374 | """show combined config settings from all hgrc files |
|
1374 | """show combined config settings from all hgrc files | |
1375 |
|
1375 | |||
1376 | With no args, print names and values of all config items. |
|
1376 | With no args, print names and values of all config items. | |
1377 |
|
1377 | |||
1378 | With one arg of the form section.name, print just the value of |
|
1378 | With one arg of the form section.name, print just the value of | |
1379 | that config item. |
|
1379 | that config item. | |
1380 |
|
1380 | |||
1381 | With multiple args, print names and values of all config items |
|
1381 | With multiple args, print names and values of all config items | |
1382 | with matching section names.""" |
|
1382 | with matching section names.""" | |
1383 |
|
1383 | |||
1384 | if values: |
|
1384 | if values: | |
1385 | if len([v for v in values if '.' in v]) > 1: |
|
1385 | if len([v for v in values if '.' in v]) > 1: | |
1386 | raise util.Abort(_('only one config item permitted')) |
|
1386 | raise util.Abort(_('only one config item permitted')) | |
1387 | for section, name, value in ui.walkconfig(): |
|
1387 | for section, name, value in ui.walkconfig(): | |
1388 | sectname = section + '.' + name |
|
1388 | sectname = section + '.' + name | |
1389 | if values: |
|
1389 | if values: | |
1390 | for v in values: |
|
1390 | for v in values: | |
1391 | if v == section: |
|
1391 | if v == section: | |
1392 | ui.write('%s=%s\n' % (sectname, value)) |
|
1392 | ui.write('%s=%s\n' % (sectname, value)) | |
1393 | elif v == sectname: |
|
1393 | elif v == sectname: | |
1394 | ui.write(value, '\n') |
|
1394 | ui.write(value, '\n') | |
1395 | else: |
|
1395 | else: | |
1396 | ui.write('%s=%s\n' % (sectname, value)) |
|
1396 | ui.write('%s=%s\n' % (sectname, value)) | |
1397 |
|
1397 | |||
1398 | def debugsetparents(ui, repo, rev1, rev2=None): |
|
1398 | def debugsetparents(ui, repo, rev1, rev2=None): | |
1399 | """manually set the parents of the current working directory |
|
1399 | """manually set the parents of the current working directory | |
1400 |
|
1400 | |||
1401 | This is useful for writing repository conversion tools, but should |
|
1401 | This is useful for writing repository conversion tools, but should | |
1402 | be used with care. |
|
1402 | be used with care. | |
1403 | """ |
|
1403 | """ | |
1404 |
|
1404 | |||
1405 | if not rev2: |
|
1405 | if not rev2: | |
1406 | rev2 = hex(nullid) |
|
1406 | rev2 = hex(nullid) | |
1407 |
|
1407 | |||
1408 | repo.dirstate.setparents(repo.lookup(rev1), repo.lookup(rev2)) |
|
1408 | repo.dirstate.setparents(repo.lookup(rev1), repo.lookup(rev2)) | |
1409 |
|
1409 | |||
1410 | def debugstate(ui, repo): |
|
1410 | def debugstate(ui, repo): | |
1411 | """show the contents of the current dirstate""" |
|
1411 | """show the contents of the current dirstate""" | |
1412 | repo.dirstate.read() |
|
1412 | repo.dirstate.read() | |
1413 | dc = repo.dirstate.map |
|
1413 | dc = repo.dirstate.map | |
1414 | keys = dc.keys() |
|
1414 | keys = dc.keys() | |
1415 | keys.sort() |
|
1415 | keys.sort() | |
1416 | for file_ in keys: |
|
1416 | for file_ in keys: | |
1417 | ui.write("%c %3o %10d %s %s\n" |
|
1417 | ui.write("%c %3o %10d %s %s\n" | |
1418 | % (dc[file_][0], dc[file_][1] & 0777, dc[file_][2], |
|
1418 | % (dc[file_][0], dc[file_][1] & 0777, dc[file_][2], | |
1419 | time.strftime("%x %X", |
|
1419 | time.strftime("%x %X", | |
1420 | time.localtime(dc[file_][3])), file_)) |
|
1420 | time.localtime(dc[file_][3])), file_)) | |
1421 | for f in repo.dirstate.copies: |
|
1421 | for f in repo.dirstate.copies: | |
1422 | ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copies[f], f)) |
|
1422 | ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copies[f], f)) | |
1423 |
|
1423 | |||
1424 | def debugdata(ui, file_, rev): |
|
1424 | def debugdata(ui, file_, rev): | |
1425 | """dump the contents of an data file revision""" |
|
1425 | """dump the contents of an data file revision""" | |
1426 | r = revlog.revlog(util.opener(os.getcwd(), audit=False), |
|
1426 | r = revlog.revlog(util.opener(os.getcwd(), audit=False), | |
1427 | file_[:-2] + ".i", file_, 0) |
|
1427 | file_[:-2] + ".i", file_, 0) | |
1428 | try: |
|
1428 | try: | |
1429 | ui.write(r.revision(r.lookup(rev))) |
|
1429 | ui.write(r.revision(r.lookup(rev))) | |
1430 | except KeyError: |
|
1430 | except KeyError: | |
1431 | raise util.Abort(_('invalid revision identifier %s'), rev) |
|
1431 | raise util.Abort(_('invalid revision identifier %s'), rev) | |
1432 |
|
1432 | |||
1433 | def debugindex(ui, file_): |
|
1433 | def debugindex(ui, file_): | |
1434 | """dump the contents of an index file""" |
|
1434 | """dump the contents of an index file""" | |
1435 | r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_, "", 0) |
|
1435 | r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_, "", 0) | |
1436 | ui.write(" rev offset length base linkrev" + |
|
1436 | ui.write(" rev offset length base linkrev" + | |
1437 | " nodeid p1 p2\n") |
|
1437 | " nodeid p1 p2\n") | |
1438 | for i in range(r.count()): |
|
1438 | for i in range(r.count()): | |
1439 | node = r.node(i) |
|
1439 | node = r.node(i) | |
1440 | pp = r.parents(node) |
|
1440 | pp = r.parents(node) | |
1441 | ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % ( |
|
1441 | ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % ( | |
1442 | i, r.start(i), r.length(i), r.base(i), r.linkrev(node), |
|
1442 | i, r.start(i), r.length(i), r.base(i), r.linkrev(node), | |
1443 | short(node), short(pp[0]), short(pp[1]))) |
|
1443 | short(node), short(pp[0]), short(pp[1]))) | |
1444 |
|
1444 | |||
1445 | def debugindexdot(ui, file_): |
|
1445 | def debugindexdot(ui, file_): | |
1446 | """dump an index DAG as a .dot file""" |
|
1446 | """dump an index DAG as a .dot file""" | |
1447 | r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_, "", 0) |
|
1447 | r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_, "", 0) | |
1448 | ui.write("digraph G {\n") |
|
1448 | ui.write("digraph G {\n") | |
1449 | for i in range(r.count()): |
|
1449 | for i in range(r.count()): | |
1450 | node = r.node(i) |
|
1450 | node = r.node(i) | |
1451 | pp = r.parents(node) |
|
1451 | pp = r.parents(node) | |
1452 | ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i)) |
|
1452 | ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i)) | |
1453 | if pp[1] != nullid: |
|
1453 | if pp[1] != nullid: | |
1454 | ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i)) |
|
1454 | ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i)) | |
1455 | ui.write("}\n") |
|
1455 | ui.write("}\n") | |
1456 |
|
1456 | |||
1457 | def debugrename(ui, repo, file, rev=None): |
|
1457 | def debugrename(ui, repo, file, rev=None): | |
1458 | """dump rename information""" |
|
1458 | """dump rename information""" | |
1459 | r = repo.file(relpath(repo, [file])[0]) |
|
1459 | r = repo.file(relpath(repo, [file])[0]) | |
1460 | if rev: |
|
1460 | if rev: | |
1461 | try: |
|
1461 | try: | |
1462 | # assume all revision numbers are for changesets |
|
1462 | # assume all revision numbers are for changesets | |
1463 | n = repo.lookup(rev) |
|
1463 | n = repo.lookup(rev) | |
1464 | change = repo.changelog.read(n) |
|
1464 | change = repo.changelog.read(n) | |
1465 | m = repo.manifest.read(change[0]) |
|
1465 | m = repo.manifest.read(change[0]) | |
1466 | n = m[relpath(repo, [file])[0]] |
|
1466 | n = m[relpath(repo, [file])[0]] | |
1467 | except (hg.RepoError, KeyError): |
|
1467 | except (hg.RepoError, KeyError): | |
1468 | n = r.lookup(rev) |
|
1468 | n = r.lookup(rev) | |
1469 | else: |
|
1469 | else: | |
1470 | n = r.tip() |
|
1470 | n = r.tip() | |
1471 | m = r.renamed(n) |
|
1471 | m = r.renamed(n) | |
1472 | if m: |
|
1472 | if m: | |
1473 | ui.write(_("renamed from %s:%s\n") % (m[0], hex(m[1]))) |
|
1473 | ui.write(_("renamed from %s:%s\n") % (m[0], hex(m[1]))) | |
1474 | else: |
|
1474 | else: | |
1475 | ui.write(_("not renamed\n")) |
|
1475 | ui.write(_("not renamed\n")) | |
1476 |
|
1476 | |||
1477 | def debugwalk(ui, repo, *pats, **opts): |
|
1477 | def debugwalk(ui, repo, *pats, **opts): | |
1478 | """show how files match on given patterns""" |
|
1478 | """show how files match on given patterns""" | |
1479 | items = list(walk(repo, pats, opts)) |
|
1479 | items = list(walk(repo, pats, opts)) | |
1480 | if not items: |
|
1480 | if not items: | |
1481 | return |
|
1481 | return | |
1482 | fmt = '%%s %%-%ds %%-%ds %%s' % ( |
|
1482 | fmt = '%%s %%-%ds %%-%ds %%s' % ( | |
1483 | max([len(abs) for (src, abs, rel, exact) in items]), |
|
1483 | max([len(abs) for (src, abs, rel, exact) in items]), | |
1484 | max([len(rel) for (src, abs, rel, exact) in items])) |
|
1484 | max([len(rel) for (src, abs, rel, exact) in items])) | |
1485 | for src, abs, rel, exact in items: |
|
1485 | for src, abs, rel, exact in items: | |
1486 | line = fmt % (src, abs, rel, exact and 'exact' or '') |
|
1486 | line = fmt % (src, abs, rel, exact and 'exact' or '') | |
1487 | ui.write("%s\n" % line.rstrip()) |
|
1487 | ui.write("%s\n" % line.rstrip()) | |
1488 |
|
1488 | |||
1489 | def diff(ui, repo, *pats, **opts): |
|
1489 | def diff(ui, repo, *pats, **opts): | |
1490 | """diff repository (or selected files) |
|
1490 | """diff repository (or selected files) | |
1491 |
|
1491 | |||
1492 | Show differences between revisions for the specified files. |
|
1492 | Show differences between revisions for the specified files. | |
1493 |
|
1493 | |||
1494 | Differences between files are shown using the unified diff format. |
|
1494 | Differences between files are shown using the unified diff format. | |
1495 |
|
1495 | |||
1496 | When two revision arguments are given, then changes are shown |
|
1496 | When two revision arguments are given, then changes are shown | |
1497 | between those revisions. If only one revision is specified then |
|
1497 | between those revisions. If only one revision is specified then | |
1498 | that revision is compared to the working directory, and, when no |
|
1498 | that revision is compared to the working directory, and, when no | |
1499 | revisions are specified, the working directory files are compared |
|
1499 | revisions are specified, the working directory files are compared | |
1500 | to its parent. |
|
1500 | to its parent. | |
1501 |
|
1501 | |||
1502 | Without the -a option, diff will avoid generating diffs of files |
|
1502 | Without the -a option, diff will avoid generating diffs of files | |
1503 | it detects as binary. With -a, diff will generate a diff anyway, |
|
1503 | it detects as binary. With -a, diff will generate a diff anyway, | |
1504 | probably with undesirable results. |
|
1504 | probably with undesirable results. | |
1505 | """ |
|
1505 | """ | |
1506 | node1, node2 = revpair(ui, repo, opts['rev']) |
|
1506 | node1, node2 = revpair(ui, repo, opts['rev']) | |
1507 |
|
1507 | |||
1508 | fns, matchfn, anypats = matchpats(repo, pats, opts) |
|
1508 | fns, matchfn, anypats = matchpats(repo, pats, opts) | |
1509 |
|
1509 | |||
1510 | dodiff(sys.stdout, ui, repo, node1, node2, fns, match=matchfn, |
|
1510 | dodiff(sys.stdout, ui, repo, node1, node2, fns, match=matchfn, | |
1511 | text=opts['text'], opts=opts) |
|
1511 | text=opts['text'], opts=opts) | |
1512 |
|
1512 | |||
1513 | def doexport(ui, repo, changeset, seqno, total, revwidth, opts): |
|
1513 | def doexport(ui, repo, changeset, seqno, total, revwidth, opts): | |
1514 | node = repo.lookup(changeset) |
|
1514 | node = repo.lookup(changeset) | |
1515 | parents = [p for p in repo.changelog.parents(node) if p != nullid] |
|
1515 | parents = [p for p in repo.changelog.parents(node) if p != nullid] | |
1516 | if opts['switch_parent']: |
|
1516 | if opts['switch_parent']: | |
1517 | parents.reverse() |
|
1517 | parents.reverse() | |
1518 | prev = (parents and parents[0]) or nullid |
|
1518 | prev = (parents and parents[0]) or nullid | |
1519 | change = repo.changelog.read(node) |
|
1519 | change = repo.changelog.read(node) | |
1520 |
|
1520 | |||
1521 | fp = make_file(repo, opts['output'], node, total=total, seqno=seqno, |
|
1521 | fp = make_file(repo, opts['output'], node, total=total, seqno=seqno, | |
1522 | revwidth=revwidth) |
|
1522 | revwidth=revwidth) | |
1523 | if fp != sys.stdout: |
|
1523 | if fp != sys.stdout: | |
1524 | ui.note("%s\n" % fp.name) |
|
1524 | ui.note("%s\n" % fp.name) | |
1525 |
|
1525 | |||
1526 | fp.write("# HG changeset patch\n") |
|
1526 | fp.write("# HG changeset patch\n") | |
1527 | fp.write("# User %s\n" % change[1]) |
|
1527 | fp.write("# User %s\n" % change[1]) | |
1528 | fp.write("# Date %d %d\n" % change[2]) |
|
1528 | fp.write("# Date %d %d\n" % change[2]) | |
1529 | fp.write("# Node ID %s\n" % hex(node)) |
|
1529 | fp.write("# Node ID %s\n" % hex(node)) | |
1530 | fp.write("# Parent %s\n" % hex(prev)) |
|
1530 | fp.write("# Parent %s\n" % hex(prev)) | |
1531 | if len(parents) > 1: |
|
1531 | if len(parents) > 1: | |
1532 | fp.write("# Parent %s\n" % hex(parents[1])) |
|
1532 | fp.write("# Parent %s\n" % hex(parents[1])) | |
1533 | fp.write(change[4].rstrip()) |
|
1533 | fp.write(change[4].rstrip()) | |
1534 | fp.write("\n\n") |
|
1534 | fp.write("\n\n") | |
1535 |
|
1535 | |||
1536 | dodiff(fp, ui, repo, prev, node, text=opts['text']) |
|
1536 | dodiff(fp, ui, repo, prev, node, text=opts['text']) | |
1537 | if fp != sys.stdout: |
|
1537 | if fp != sys.stdout: | |
1538 | fp.close() |
|
1538 | fp.close() | |
1539 |
|
1539 | |||
1540 | def export(ui, repo, *changesets, **opts): |
|
1540 | def export(ui, repo, *changesets, **opts): | |
1541 | """dump the header and diffs for one or more changesets |
|
1541 | """dump the header and diffs for one or more changesets | |
1542 |
|
1542 | |||
1543 | Print the changeset header and diffs for one or more revisions. |
|
1543 | Print the changeset header and diffs for one or more revisions. | |
1544 |
|
1544 | |||
1545 | The information shown in the changeset header is: author, |
|
1545 | The information shown in the changeset header is: author, | |
1546 | changeset hash, parent and commit comment. |
|
1546 | changeset hash, parent and commit comment. | |
1547 |
|
1547 | |||
1548 | Output may be to a file, in which case the name of the file is |
|
1548 | Output may be to a file, in which case the name of the file is | |
1549 | given using a format string. The formatting rules are as follows: |
|
1549 | given using a format string. The formatting rules are as follows: | |
1550 |
|
1550 | |||
1551 | %% literal "%" character |
|
1551 | %% literal "%" character | |
1552 | %H changeset hash (40 bytes of hexadecimal) |
|
1552 | %H changeset hash (40 bytes of hexadecimal) | |
1553 | %N number of patches being generated |
|
1553 | %N number of patches being generated | |
1554 | %R changeset revision number |
|
1554 | %R changeset revision number | |
1555 | %b basename of the exporting repository |
|
1555 | %b basename of the exporting repository | |
1556 | %h short-form changeset hash (12 bytes of hexadecimal) |
|
1556 | %h short-form changeset hash (12 bytes of hexadecimal) | |
1557 | %n zero-padded sequence number, starting at 1 |
|
1557 | %n zero-padded sequence number, starting at 1 | |
1558 | %r zero-padded changeset revision number |
|
1558 | %r zero-padded changeset revision number | |
1559 |
|
1559 | |||
1560 | Without the -a option, export will avoid generating diffs of files |
|
1560 | Without the -a option, export will avoid generating diffs of files | |
1561 | it detects as binary. With -a, export will generate a diff anyway, |
|
1561 | it detects as binary. With -a, export will generate a diff anyway, | |
1562 | probably with undesirable results. |
|
1562 | probably with undesirable results. | |
1563 |
|
1563 | |||
1564 | With the --switch-parent option, the diff will be against the second |
|
1564 | With the --switch-parent option, the diff will be against the second | |
1565 | parent. It can be useful to review a merge. |
|
1565 | parent. It can be useful to review a merge. | |
1566 | """ |
|
1566 | """ | |
1567 | if not changesets: |
|
1567 | if not changesets: | |
1568 | raise util.Abort(_("export requires at least one changeset")) |
|
1568 | raise util.Abort(_("export requires at least one changeset")) | |
1569 | seqno = 0 |
|
1569 | seqno = 0 | |
1570 | revs = list(revrange(ui, repo, changesets)) |
|
1570 | revs = list(revrange(ui, repo, changesets)) | |
1571 | total = len(revs) |
|
1571 | total = len(revs) | |
1572 | revwidth = max(map(len, revs)) |
|
1572 | revwidth = max(map(len, revs)) | |
1573 | msg = len(revs) > 1 and _("Exporting patches:\n") or _("Exporting patch:\n") |
|
1573 | msg = len(revs) > 1 and _("Exporting patches:\n") or _("Exporting patch:\n") | |
1574 | ui.note(msg) |
|
1574 | ui.note(msg) | |
1575 | for cset in revs: |
|
1575 | for cset in revs: | |
1576 | seqno += 1 |
|
1576 | seqno += 1 | |
1577 | doexport(ui, repo, cset, seqno, total, revwidth, opts) |
|
1577 | doexport(ui, repo, cset, seqno, total, revwidth, opts) | |
1578 |
|
1578 | |||
1579 | def forget(ui, repo, *pats, **opts): |
|
1579 | def forget(ui, repo, *pats, **opts): | |
1580 | """don't add the specified files on the next commit (DEPRECATED) |
|
1580 | """don't add the specified files on the next commit (DEPRECATED) | |
1581 |
|
1581 | |||
1582 | (DEPRECATED) |
|
1582 | (DEPRECATED) | |
1583 | Undo an 'hg add' scheduled for the next commit. |
|
1583 | Undo an 'hg add' scheduled for the next commit. | |
1584 |
|
1584 | |||
1585 | This command is now deprecated and will be removed in a future |
|
1585 | This command is now deprecated and will be removed in a future | |
1586 | release. Please use revert instead. |
|
1586 | release. Please use revert instead. | |
1587 | """ |
|
1587 | """ | |
1588 | ui.warn(_("(the forget command is deprecated; use revert instead)\n")) |
|
1588 | ui.warn(_("(the forget command is deprecated; use revert instead)\n")) | |
1589 | forget = [] |
|
1589 | forget = [] | |
1590 | for src, abs, rel, exact in walk(repo, pats, opts): |
|
1590 | for src, abs, rel, exact in walk(repo, pats, opts): | |
1591 | if repo.dirstate.state(abs) == 'a': |
|
1591 | if repo.dirstate.state(abs) == 'a': | |
1592 | forget.append(abs) |
|
1592 | forget.append(abs) | |
1593 | if ui.verbose or not exact: |
|
1593 | if ui.verbose or not exact: | |
1594 | ui.status(_('forgetting %s\n') % ((pats and rel) or abs)) |
|
1594 | ui.status(_('forgetting %s\n') % ((pats and rel) or abs)) | |
1595 | repo.forget(forget) |
|
1595 | repo.forget(forget) | |
1596 |
|
1596 | |||
1597 | def grep(ui, repo, pattern, *pats, **opts): |
|
1597 | def grep(ui, repo, pattern, *pats, **opts): | |
1598 | """search for a pattern in specified files and revisions |
|
1598 | """search for a pattern in specified files and revisions | |
1599 |
|
1599 | |||
1600 | Search revisions of files for a regular expression. |
|
1600 | Search revisions of files for a regular expression. | |
1601 |
|
1601 | |||
1602 | This command behaves differently than Unix grep. It only accepts |
|
1602 | This command behaves differently than Unix grep. It only accepts | |
1603 | Python/Perl regexps. It searches repository history, not the |
|
1603 | Python/Perl regexps. It searches repository history, not the | |
1604 | working directory. It always prints the revision number in which |
|
1604 | working directory. It always prints the revision number in which | |
1605 | a match appears. |
|
1605 | a match appears. | |
1606 |
|
1606 | |||
1607 | By default, grep only prints output for the first revision of a |
|
1607 | By default, grep only prints output for the first revision of a | |
1608 | file in which it finds a match. To get it to print every revision |
|
1608 | file in which it finds a match. To get it to print every revision | |
1609 | that contains a change in match status ("-" for a match that |
|
1609 | that contains a change in match status ("-" for a match that | |
1610 | becomes a non-match, or "+" for a non-match that becomes a match), |
|
1610 | becomes a non-match, or "+" for a non-match that becomes a match), | |
1611 | use the --all flag. |
|
1611 | use the --all flag. | |
1612 | """ |
|
1612 | """ | |
1613 | reflags = 0 |
|
1613 | reflags = 0 | |
1614 | if opts['ignore_case']: |
|
1614 | if opts['ignore_case']: | |
1615 | reflags |= re.I |
|
1615 | reflags |= re.I | |
1616 | regexp = re.compile(pattern, reflags) |
|
1616 | regexp = re.compile(pattern, reflags) | |
1617 | sep, eol = ':', '\n' |
|
1617 | sep, eol = ':', '\n' | |
1618 | if opts['print0']: |
|
1618 | if opts['print0']: | |
1619 | sep = eol = '\0' |
|
1619 | sep = eol = '\0' | |
1620 |
|
1620 | |||
1621 | fcache = {} |
|
1621 | fcache = {} | |
1622 | def getfile(fn): |
|
1622 | def getfile(fn): | |
1623 | if fn not in fcache: |
|
1623 | if fn not in fcache: | |
1624 | fcache[fn] = repo.file(fn) |
|
1624 | fcache[fn] = repo.file(fn) | |
1625 | return fcache[fn] |
|
1625 | return fcache[fn] | |
1626 |
|
1626 | |||
1627 | def matchlines(body): |
|
1627 | def matchlines(body): | |
1628 | begin = 0 |
|
1628 | begin = 0 | |
1629 | linenum = 0 |
|
1629 | linenum = 0 | |
1630 | while True: |
|
1630 | while True: | |
1631 | match = regexp.search(body, begin) |
|
1631 | match = regexp.search(body, begin) | |
1632 | if not match: |
|
1632 | if not match: | |
1633 | break |
|
1633 | break | |
1634 | mstart, mend = match.span() |
|
1634 | mstart, mend = match.span() | |
1635 | linenum += body.count('\n', begin, mstart) + 1 |
|
1635 | linenum += body.count('\n', begin, mstart) + 1 | |
1636 | lstart = body.rfind('\n', begin, mstart) + 1 or begin |
|
1636 | lstart = body.rfind('\n', begin, mstart) + 1 or begin | |
1637 | lend = body.find('\n', mend) |
|
1637 | lend = body.find('\n', mend) | |
1638 | yield linenum, mstart - lstart, mend - lstart, body[lstart:lend] |
|
1638 | yield linenum, mstart - lstart, mend - lstart, body[lstart:lend] | |
1639 | begin = lend + 1 |
|
1639 | begin = lend + 1 | |
1640 |
|
1640 | |||
1641 | class linestate(object): |
|
1641 | class linestate(object): | |
1642 | def __init__(self, line, linenum, colstart, colend): |
|
1642 | def __init__(self, line, linenum, colstart, colend): | |
1643 | self.line = line |
|
1643 | self.line = line | |
1644 | self.linenum = linenum |
|
1644 | self.linenum = linenum | |
1645 | self.colstart = colstart |
|
1645 | self.colstart = colstart | |
1646 | self.colend = colend |
|
1646 | self.colend = colend | |
1647 | def __eq__(self, other): |
|
1647 | def __eq__(self, other): | |
1648 | return self.line == other.line |
|
1648 | return self.line == other.line | |
1649 | def __hash__(self): |
|
1649 | def __hash__(self): | |
1650 | return hash(self.line) |
|
1650 | return hash(self.line) | |
1651 |
|
1651 | |||
1652 | matches = {} |
|
1652 | matches = {} | |
1653 | def grepbody(fn, rev, body): |
|
1653 | def grepbody(fn, rev, body): | |
1654 | matches[rev].setdefault(fn, {}) |
|
1654 | matches[rev].setdefault(fn, {}) | |
1655 | m = matches[rev][fn] |
|
1655 | m = matches[rev][fn] | |
1656 | for lnum, cstart, cend, line in matchlines(body): |
|
1656 | for lnum, cstart, cend, line in matchlines(body): | |
1657 | s = linestate(line, lnum, cstart, cend) |
|
1657 | s = linestate(line, lnum, cstart, cend) | |
1658 | m[s] = s |
|
1658 | m[s] = s | |
1659 |
|
1659 | |||
1660 | # FIXME: prev isn't used, why ? |
|
1660 | # FIXME: prev isn't used, why ? | |
1661 | prev = {} |
|
1661 | prev = {} | |
1662 | ucache = {} |
|
1662 | ucache = {} | |
1663 | def display(fn, rev, states, prevstates): |
|
1663 | def display(fn, rev, states, prevstates): | |
1664 | diff = list(sets.Set(states).symmetric_difference(sets.Set(prevstates))) |
|
1664 | diff = list(sets.Set(states).symmetric_difference(sets.Set(prevstates))) | |
1665 | diff.sort(lambda x, y: cmp(x.linenum, y.linenum)) |
|
1665 | diff.sort(lambda x, y: cmp(x.linenum, y.linenum)) | |
1666 | counts = {'-': 0, '+': 0} |
|
1666 | counts = {'-': 0, '+': 0} | |
1667 | filerevmatches = {} |
|
1667 | filerevmatches = {} | |
1668 | for l in diff: |
|
1668 | for l in diff: | |
1669 | if incrementing or not opts['all']: |
|
1669 | if incrementing or not opts['all']: | |
1670 | change = ((l in prevstates) and '-') or '+' |
|
1670 | change = ((l in prevstates) and '-') or '+' | |
1671 | r = rev |
|
1671 | r = rev | |
1672 | else: |
|
1672 | else: | |
1673 | change = ((l in states) and '-') or '+' |
|
1673 | change = ((l in states) and '-') or '+' | |
1674 | r = prev[fn] |
|
1674 | r = prev[fn] | |
1675 | cols = [fn, str(rev)] |
|
1675 | cols = [fn, str(rev)] | |
1676 | if opts['line_number']: |
|
1676 | if opts['line_number']: | |
1677 | cols.append(str(l.linenum)) |
|
1677 | cols.append(str(l.linenum)) | |
1678 | if opts['all']: |
|
1678 | if opts['all']: | |
1679 | cols.append(change) |
|
1679 | cols.append(change) | |
1680 | if opts['user']: |
|
1680 | if opts['user']: | |
1681 | cols.append(trimuser(ui, getchange(rev)[1], rev, |
|
1681 | cols.append(trimuser(ui, getchange(rev)[1], rev, | |
1682 | ucache)) |
|
1682 | ucache)) | |
1683 | if opts['files_with_matches']: |
|
1683 | if opts['files_with_matches']: | |
1684 | c = (fn, rev) |
|
1684 | c = (fn, rev) | |
1685 | if c in filerevmatches: |
|
1685 | if c in filerevmatches: | |
1686 | continue |
|
1686 | continue | |
1687 | filerevmatches[c] = 1 |
|
1687 | filerevmatches[c] = 1 | |
1688 | else: |
|
1688 | else: | |
1689 | cols.append(l.line) |
|
1689 | cols.append(l.line) | |
1690 | ui.write(sep.join(cols), eol) |
|
1690 | ui.write(sep.join(cols), eol) | |
1691 | counts[change] += 1 |
|
1691 | counts[change] += 1 | |
1692 | return counts['+'], counts['-'] |
|
1692 | return counts['+'], counts['-'] | |
1693 |
|
1693 | |||
1694 | fstate = {} |
|
1694 | fstate = {} | |
1695 | skip = {} |
|
1695 | skip = {} | |
1696 | changeiter, getchange, matchfn = walkchangerevs(ui, repo, pats, opts) |
|
1696 | changeiter, getchange, matchfn = walkchangerevs(ui, repo, pats, opts) | |
1697 | count = 0 |
|
1697 | count = 0 | |
1698 | incrementing = False |
|
1698 | incrementing = False | |
1699 | for st, rev, fns in changeiter: |
|
1699 | for st, rev, fns in changeiter: | |
1700 | if st == 'window': |
|
1700 | if st == 'window': | |
1701 | incrementing = rev |
|
1701 | incrementing = rev | |
1702 | matches.clear() |
|
1702 | matches.clear() | |
1703 | elif st == 'add': |
|
1703 | elif st == 'add': | |
1704 | change = repo.changelog.read(repo.lookup(str(rev))) |
|
1704 | change = repo.changelog.read(repo.lookup(str(rev))) | |
1705 | mf = repo.manifest.read(change[0]) |
|
1705 | mf = repo.manifest.read(change[0]) | |
1706 | matches[rev] = {} |
|
1706 | matches[rev] = {} | |
1707 | for fn in fns: |
|
1707 | for fn in fns: | |
1708 | if fn in skip: |
|
1708 | if fn in skip: | |
1709 | continue |
|
1709 | continue | |
1710 | fstate.setdefault(fn, {}) |
|
1710 | fstate.setdefault(fn, {}) | |
1711 | try: |
|
1711 | try: | |
1712 | grepbody(fn, rev, getfile(fn).read(mf[fn])) |
|
1712 | grepbody(fn, rev, getfile(fn).read(mf[fn])) | |
1713 | except KeyError: |
|
1713 | except KeyError: | |
1714 | pass |
|
1714 | pass | |
1715 | elif st == 'iter': |
|
1715 | elif st == 'iter': | |
1716 | states = matches[rev].items() |
|
1716 | states = matches[rev].items() | |
1717 | states.sort() |
|
1717 | states.sort() | |
1718 | for fn, m in states: |
|
1718 | for fn, m in states: | |
1719 | if fn in skip: |
|
1719 | if fn in skip: | |
1720 | continue |
|
1720 | continue | |
1721 | if incrementing or not opts['all'] or fstate[fn]: |
|
1721 | if incrementing or not opts['all'] or fstate[fn]: | |
1722 | pos, neg = display(fn, rev, m, fstate[fn]) |
|
1722 | pos, neg = display(fn, rev, m, fstate[fn]) | |
1723 | count += pos + neg |
|
1723 | count += pos + neg | |
1724 | if pos and not opts['all']: |
|
1724 | if pos and not opts['all']: | |
1725 | skip[fn] = True |
|
1725 | skip[fn] = True | |
1726 | fstate[fn] = m |
|
1726 | fstate[fn] = m | |
1727 | prev[fn] = rev |
|
1727 | prev[fn] = rev | |
1728 |
|
1728 | |||
1729 | if not incrementing: |
|
1729 | if not incrementing: | |
1730 | fstate = fstate.items() |
|
1730 | fstate = fstate.items() | |
1731 | fstate.sort() |
|
1731 | fstate.sort() | |
1732 | for fn, state in fstate: |
|
1732 | for fn, state in fstate: | |
1733 | if fn in skip: |
|
1733 | if fn in skip: | |
1734 | continue |
|
1734 | continue | |
1735 | display(fn, rev, {}, state) |
|
1735 | display(fn, rev, {}, state) | |
1736 | return (count == 0 and 1) or 0 |
|
1736 | return (count == 0 and 1) or 0 | |
1737 |
|
1737 | |||
1738 | def heads(ui, repo, **opts): |
|
1738 | def heads(ui, repo, **opts): | |
1739 | """show current repository heads |
|
1739 | """show current repository heads | |
1740 |
|
1740 | |||
1741 | Show all repository head changesets. |
|
1741 | Show all repository head changesets. | |
1742 |
|
1742 | |||
1743 | Repository "heads" are changesets that don't have children |
|
1743 | Repository "heads" are changesets that don't have children | |
1744 | changesets. They are where development generally takes place and |
|
1744 | changesets. They are where development generally takes place and | |
1745 | are the usual targets for update and merge operations. |
|
1745 | are the usual targets for update and merge operations. | |
1746 | """ |
|
1746 | """ | |
1747 | if opts['rev']: |
|
1747 | if opts['rev']: | |
1748 | heads = repo.heads(repo.lookup(opts['rev'])) |
|
1748 | heads = repo.heads(repo.lookup(opts['rev'])) | |
1749 | else: |
|
1749 | else: | |
1750 | heads = repo.heads() |
|
1750 | heads = repo.heads() | |
1751 | br = None |
|
1751 | br = None | |
1752 | if opts['branches']: |
|
1752 | if opts['branches']: | |
1753 | br = repo.branchlookup(heads) |
|
1753 | br = repo.branchlookup(heads) | |
1754 | displayer = show_changeset(ui, repo, opts) |
|
1754 | displayer = show_changeset(ui, repo, opts) | |
1755 | for n in heads: |
|
1755 | for n in heads: | |
1756 | displayer.show(changenode=n, brinfo=br) |
|
1756 | displayer.show(changenode=n, brinfo=br) | |
1757 |
|
1757 | |||
1758 | def identify(ui, repo): |
|
1758 | def identify(ui, repo): | |
1759 | """print information about the working copy |
|
1759 | """print information about the working copy | |
1760 |
|
1760 | |||
1761 | Print a short summary of the current state of the repo. |
|
1761 | Print a short summary of the current state of the repo. | |
1762 |
|
1762 | |||
1763 | This summary identifies the repository state using one or two parent |
|
1763 | This summary identifies the repository state using one or two parent | |
1764 | hash identifiers, followed by a "+" if there are uncommitted changes |
|
1764 | hash identifiers, followed by a "+" if there are uncommitted changes | |
1765 | in the working directory, followed by a list of tags for this revision. |
|
1765 | in the working directory, followed by a list of tags for this revision. | |
1766 | """ |
|
1766 | """ | |
1767 | parents = [p for p in repo.dirstate.parents() if p != nullid] |
|
1767 | parents = [p for p in repo.dirstate.parents() if p != nullid] | |
1768 | if not parents: |
|
1768 | if not parents: | |
1769 | ui.write(_("unknown\n")) |
|
1769 | ui.write(_("unknown\n")) | |
1770 | return |
|
1770 | return | |
1771 |
|
1771 | |||
1772 | hexfunc = ui.verbose and hex or short |
|
1772 | hexfunc = ui.verbose and hex or short | |
1773 | modified, added, removed, deleted, unknown = repo.changes() |
|
1773 | modified, added, removed, deleted, unknown = repo.changes() | |
1774 | output = ["%s%s" % |
|
1774 | output = ["%s%s" % | |
1775 | ('+'.join([hexfunc(parent) for parent in parents]), |
|
1775 | ('+'.join([hexfunc(parent) for parent in parents]), | |
1776 | (modified or added or removed or deleted) and "+" or "")] |
|
1776 | (modified or added or removed or deleted) and "+" or "")] | |
1777 |
|
1777 | |||
1778 | if not ui.quiet: |
|
1778 | if not ui.quiet: | |
1779 | # multiple tags for a single parent separated by '/' |
|
1779 | # multiple tags for a single parent separated by '/' | |
1780 | parenttags = ['/'.join(tags) |
|
1780 | parenttags = ['/'.join(tags) | |
1781 | for tags in map(repo.nodetags, parents) if tags] |
|
1781 | for tags in map(repo.nodetags, parents) if tags] | |
1782 | # tags for multiple parents separated by ' + ' |
|
1782 | # tags for multiple parents separated by ' + ' | |
1783 | if parenttags: |
|
1783 | if parenttags: | |
1784 | output.append(' + '.join(parenttags)) |
|
1784 | output.append(' + '.join(parenttags)) | |
1785 |
|
1785 | |||
1786 | ui.write("%s\n" % ' '.join(output)) |
|
1786 | ui.write("%s\n" % ' '.join(output)) | |
1787 |
|
1787 | |||
1788 | def import_(ui, repo, patch1, *patches, **opts): |
|
1788 | def import_(ui, repo, patch1, *patches, **opts): | |
1789 | """import an ordered set of patches |
|
1789 | """import an ordered set of patches | |
1790 |
|
1790 | |||
1791 | Import a list of patches and commit them individually. |
|
1791 | Import a list of patches and commit them individually. | |
1792 |
|
1792 | |||
1793 | If there are outstanding changes in the working directory, import |
|
1793 | If there are outstanding changes in the working directory, import | |
1794 | will abort unless given the -f flag. |
|
1794 | will abort unless given the -f flag. | |
1795 |
|
1795 | |||
1796 | You can import a patch straight from a mail message. Even patches |
|
1796 | You can import a patch straight from a mail message. Even patches | |
1797 | as attachments work (body part must be type text/plain or |
|
1797 | as attachments work (body part must be type text/plain or | |
1798 | text/x-patch to be used). From and Subject headers of email |
|
1798 | text/x-patch to be used). From and Subject headers of email | |
1799 | message are used as default committer and commit message. All |
|
1799 | message are used as default committer and commit message. All | |
1800 | text/plain body parts before first diff are added to commit |
|
1800 | text/plain body parts before first diff are added to commit | |
1801 | message. |
|
1801 | message. | |
1802 |
|
1802 | |||
1803 | If imported patch was generated by hg export, user and description |
|
1803 | If imported patch was generated by hg export, user and description | |
1804 | from patch override values from message headers and body. Values |
|
1804 | from patch override values from message headers and body. Values | |
1805 | given on command line with -m and -u override these. |
|
1805 | given on command line with -m and -u override these. | |
1806 |
|
1806 | |||
1807 | To read a patch from standard input, use patch name "-". |
|
1807 | To read a patch from standard input, use patch name "-". | |
1808 | """ |
|
1808 | """ | |
1809 | patches = (patch1,) + patches |
|
1809 | patches = (patch1,) + patches | |
1810 |
|
1810 | |||
1811 | if not opts['force']: |
|
1811 | if not opts['force']: | |
1812 | bail_if_changed(repo) |
|
1812 | bail_if_changed(repo) | |
1813 |
|
1813 | |||
1814 | d = opts["base"] |
|
1814 | d = opts["base"] | |
1815 | strip = opts["strip"] |
|
1815 | strip = opts["strip"] | |
1816 |
|
1816 | |||
1817 | mailre = re.compile(r'(?:From |[\w-]+:)') |
|
1817 | mailre = re.compile(r'(?:From |[\w-]+:)') | |
1818 |
|
1818 | |||
1819 | # attempt to detect the start of a patch |
|
1819 | # attempt to detect the start of a patch | |
1820 | # (this heuristic is borrowed from quilt) |
|
1820 | # (this heuristic is borrowed from quilt) | |
1821 | diffre = re.compile(r'^(?:Index:[ \t]|diff[ \t]|RCS file: |' + |
|
1821 | diffre = re.compile(r'^(?:Index:[ \t]|diff[ \t]|RCS file: |' + | |
1822 | 'retrieving revision [0-9]+(\.[0-9]+)*$|' + |
|
1822 | 'retrieving revision [0-9]+(\.[0-9]+)*$|' + | |
1823 | '(---|\*\*\*)[ \t])', re.MULTILINE) |
|
1823 | '(---|\*\*\*)[ \t])', re.MULTILINE) | |
1824 |
|
1824 | |||
1825 | for patch in patches: |
|
1825 | for patch in patches: | |
1826 | pf = os.path.join(d, patch) |
|
1826 | pf = os.path.join(d, patch) | |
1827 |
|
1827 | |||
1828 | message = None |
|
1828 | message = None | |
1829 | user = None |
|
1829 | user = None | |
1830 | date = None |
|
1830 | date = None | |
1831 | hgpatch = False |
|
1831 | hgpatch = False | |
1832 |
|
1832 | |||
1833 | p = email.Parser.Parser() |
|
1833 | p = email.Parser.Parser() | |
1834 | if pf == '-': |
|
1834 | if pf == '-': | |
1835 | msg = p.parse(sys.stdin) |
|
1835 | msg = p.parse(sys.stdin) | |
1836 | ui.status(_("applying patch from stdin\n")) |
|
1836 | ui.status(_("applying patch from stdin\n")) | |
1837 | else: |
|
1837 | else: | |
1838 | msg = p.parse(file(pf)) |
|
1838 | msg = p.parse(file(pf)) | |
1839 | ui.status(_("applying %s\n") % patch) |
|
1839 | ui.status(_("applying %s\n") % patch) | |
1840 |
|
1840 | |||
1841 | fd, tmpname = tempfile.mkstemp(prefix='hg-patch-') |
|
1841 | fd, tmpname = tempfile.mkstemp(prefix='hg-patch-') | |
1842 | tmpfp = os.fdopen(fd, 'w') |
|
1842 | tmpfp = os.fdopen(fd, 'w') | |
1843 | try: |
|
1843 | try: | |
1844 | message = msg['Subject'] |
|
1844 | message = msg['Subject'] | |
1845 | if message: |
|
1845 | if message: | |
1846 | message = message.replace('\n\t', ' ') |
|
1846 | message = message.replace('\n\t', ' ') | |
1847 | ui.debug('Subject: %s\n' % message) |
|
1847 | ui.debug('Subject: %s\n' % message) | |
1848 | user = msg['From'] |
|
1848 | user = msg['From'] | |
1849 | if user: |
|
1849 | if user: | |
1850 | ui.debug('From: %s\n' % user) |
|
1850 | ui.debug('From: %s\n' % user) | |
1851 | diffs_seen = 0 |
|
1851 | diffs_seen = 0 | |
1852 | ok_types = ('text/plain', 'text/x-diff', 'text/x-patch') |
|
1852 | ok_types = ('text/plain', 'text/x-diff', 'text/x-patch') | |
1853 | for part in msg.walk(): |
|
1853 | for part in msg.walk(): | |
1854 | content_type = part.get_content_type() |
|
1854 | content_type = part.get_content_type() | |
1855 | ui.debug('Content-Type: %s\n' % content_type) |
|
1855 | ui.debug('Content-Type: %s\n' % content_type) | |
1856 | if content_type not in ok_types: |
|
1856 | if content_type not in ok_types: | |
1857 | continue |
|
1857 | continue | |
1858 | payload = part.get_payload(decode=True) |
|
1858 | payload = part.get_payload(decode=True) | |
1859 | m = diffre.search(payload) |
|
1859 | m = diffre.search(payload) | |
1860 | if m: |
|
1860 | if m: | |
1861 | ui.debug(_('found patch at byte %d\n') % m.start(0)) |
|
1861 | ui.debug(_('found patch at byte %d\n') % m.start(0)) | |
1862 | diffs_seen += 1 |
|
1862 | diffs_seen += 1 | |
1863 | hgpatch = False |
|
1863 | hgpatch = False | |
1864 | fp = cStringIO.StringIO() |
|
1864 | fp = cStringIO.StringIO() | |
1865 | if message: |
|
1865 | if message: | |
1866 | fp.write(message) |
|
1866 | fp.write(message) | |
1867 | fp.write('\n') |
|
1867 | fp.write('\n') | |
1868 | for line in payload[:m.start(0)].splitlines(): |
|
1868 | for line in payload[:m.start(0)].splitlines(): | |
1869 | if line.startswith('# HG changeset patch'): |
|
1869 | if line.startswith('# HG changeset patch'): | |
1870 | ui.debug(_('patch generated by hg export\n')) |
|
1870 | ui.debug(_('patch generated by hg export\n')) | |
1871 | hgpatch = True |
|
1871 | hgpatch = True | |
1872 | # drop earlier commit message content |
|
1872 | # drop earlier commit message content | |
1873 | fp.seek(0) |
|
1873 | fp.seek(0) | |
1874 | fp.truncate() |
|
1874 | fp.truncate() | |
1875 | elif hgpatch: |
|
1875 | elif hgpatch: | |
1876 | if line.startswith('# User '): |
|
1876 | if line.startswith('# User '): | |
1877 | user = line[7:] |
|
1877 | user = line[7:] | |
1878 | ui.debug('From: %s\n' % user) |
|
1878 | ui.debug('From: %s\n' % user) | |
1879 | elif line.startswith("# Date "): |
|
1879 | elif line.startswith("# Date "): | |
1880 | date = line[7:] |
|
1880 | date = line[7:] | |
1881 | if not line.startswith('# '): |
|
1881 | if not line.startswith('# '): | |
1882 | fp.write(line) |
|
1882 | fp.write(line) | |
1883 | fp.write('\n') |
|
1883 | fp.write('\n') | |
1884 | message = fp.getvalue() |
|
1884 | message = fp.getvalue() | |
1885 | if tmpfp: |
|
1885 | if tmpfp: | |
1886 | tmpfp.write(payload) |
|
1886 | tmpfp.write(payload) | |
1887 | if not payload.endswith('\n'): |
|
1887 | if not payload.endswith('\n'): | |
1888 | tmpfp.write('\n') |
|
1888 | tmpfp.write('\n') | |
1889 | elif not diffs_seen and message and content_type == 'text/plain': |
|
1889 | elif not diffs_seen and message and content_type == 'text/plain': | |
1890 | message += '\n' + payload |
|
1890 | message += '\n' + payload | |
1891 |
|
1891 | |||
1892 | if opts['message']: |
|
1892 | if opts['message']: | |
1893 | # pickup the cmdline msg |
|
1893 | # pickup the cmdline msg | |
1894 | message = opts['message'] |
|
1894 | message = opts['message'] | |
1895 | elif message: |
|
1895 | elif message: | |
1896 | # pickup the patch msg |
|
1896 | # pickup the patch msg | |
1897 | message = message.strip() |
|
1897 | message = message.strip() | |
1898 | else: |
|
1898 | else: | |
1899 | # launch the editor |
|
1899 | # launch the editor | |
1900 | message = None |
|
1900 | message = None | |
1901 | ui.debug(_('message:\n%s\n') % message) |
|
1901 | ui.debug(_('message:\n%s\n') % message) | |
1902 |
|
1902 | |||
1903 | tmpfp.close() |
|
1903 | tmpfp.close() | |
1904 | if not diffs_seen: |
|
1904 | if not diffs_seen: | |
1905 | raise util.Abort(_('no diffs found')) |
|
1905 | raise util.Abort(_('no diffs found')) | |
1906 |
|
1906 | |||
1907 | files = util.patch(strip, tmpname, ui, cwd=repo.root) |
|
1907 | files = util.patch(strip, tmpname, ui, cwd=repo.root) | |
1908 | if len(files) > 0: |
|
1908 | if len(files) > 0: | |
1909 | cfiles = files |
|
1909 | cfiles = files | |
1910 | cwd = repo.getcwd() |
|
1910 | cwd = repo.getcwd() | |
1911 | if cwd: |
|
1911 | if cwd: | |
1912 | cfiles = [util.pathto(cwd, f) for f in files] |
|
1912 | cfiles = [util.pathto(cwd, f) for f in files] | |
1913 | addremove_lock(ui, repo, cfiles, {}) |
|
1913 | addremove_lock(ui, repo, cfiles, {}) | |
1914 | repo.commit(files, message, user, date) |
|
1914 | repo.commit(files, message, user, date) | |
1915 | finally: |
|
1915 | finally: | |
1916 | os.unlink(tmpname) |
|
1916 | os.unlink(tmpname) | |
1917 |
|
1917 | |||
1918 | def incoming(ui, repo, source="default", **opts): |
|
1918 | def incoming(ui, repo, source="default", **opts): | |
1919 | """show new changesets found in source |
|
1919 | """show new changesets found in source | |
1920 |
|
1920 | |||
1921 | Show new changesets found in the specified path/URL or the default |
|
1921 | Show new changesets found in the specified path/URL or the default | |
1922 | pull location. These are the changesets that would be pulled if a pull |
|
1922 | pull location. These are the changesets that would be pulled if a pull | |
1923 | was requested. |
|
1923 | was requested. | |
1924 |
|
1924 | |||
1925 | For remote repository, using --bundle avoids downloading the changesets |
|
1925 | For remote repository, using --bundle avoids downloading the changesets | |
1926 | twice if the incoming is followed by a pull. |
|
1926 | twice if the incoming is followed by a pull. | |
1927 |
|
1927 | |||
1928 | See pull for valid source format details. |
|
1928 | See pull for valid source format details. | |
1929 | """ |
|
1929 | """ | |
1930 | source = ui.expandpath(source) |
|
1930 | source = ui.expandpath(source) | |
1931 | setremoteconfig(ui, opts) |
|
1931 | setremoteconfig(ui, opts) | |
1932 |
|
1932 | |||
1933 | other = hg.repository(ui, source) |
|
1933 | other = hg.repository(ui, source) | |
1934 | incoming = repo.findincoming(other, force=opts["force"]) |
|
1934 | incoming = repo.findincoming(other, force=opts["force"]) | |
1935 | if not incoming: |
|
1935 | if not incoming: | |
1936 | ui.status(_("no changes found\n")) |
|
1936 | ui.status(_("no changes found\n")) | |
1937 | return |
|
1937 | return | |
1938 |
|
1938 | |||
1939 | cleanup = None |
|
1939 | cleanup = None | |
1940 | try: |
|
1940 | try: | |
1941 | fname = opts["bundle"] |
|
1941 | fname = opts["bundle"] | |
1942 | if fname or not other.local(): |
|
1942 | if fname or not other.local(): | |
1943 | # create a bundle (uncompressed if other repo is not local) |
|
1943 | # create a bundle (uncompressed if other repo is not local) | |
1944 | cg = other.changegroup(incoming, "incoming") |
|
1944 | cg = other.changegroup(incoming, "incoming") | |
1945 | fname = cleanup = write_bundle(cg, fname, compress=other.local()) |
|
1945 | fname = cleanup = write_bundle(cg, fname, compress=other.local()) | |
1946 | # keep written bundle? |
|
1946 | # keep written bundle? | |
1947 | if opts["bundle"]: |
|
1947 | if opts["bundle"]: | |
1948 | cleanup = None |
|
1948 | cleanup = None | |
1949 | if not other.local(): |
|
1949 | if not other.local(): | |
1950 | # use the created uncompressed bundlerepo |
|
1950 | # use the created uncompressed bundlerepo | |
1951 | other = bundlerepo.bundlerepository(ui, repo.root, fname) |
|
1951 | other = bundlerepo.bundlerepository(ui, repo.root, fname) | |
1952 |
|
1952 | |||
1953 | revs = None |
|
1953 | revs = None | |
1954 | if opts['rev']: |
|
1954 | if opts['rev']: | |
1955 | revs = [other.lookup(rev) for rev in opts['rev']] |
|
1955 | revs = [other.lookup(rev) for rev in opts['rev']] | |
1956 | o = other.changelog.nodesbetween(incoming, revs)[0] |
|
1956 | o = other.changelog.nodesbetween(incoming, revs)[0] | |
1957 | if opts['newest_first']: |
|
1957 | if opts['newest_first']: | |
1958 | o.reverse() |
|
1958 | o.reverse() | |
1959 | displayer = show_changeset(ui, other, opts) |
|
1959 | displayer = show_changeset(ui, other, opts) | |
1960 | for n in o: |
|
1960 | for n in o: | |
1961 | parents = [p for p in other.changelog.parents(n) if p != nullid] |
|
1961 | parents = [p for p in other.changelog.parents(n) if p != nullid] | |
1962 | if opts['no_merges'] and len(parents) == 2: |
|
1962 | if opts['no_merges'] and len(parents) == 2: | |
1963 | continue |
|
1963 | continue | |
1964 | displayer.show(changenode=n) |
|
1964 | displayer.show(changenode=n) | |
1965 | if opts['patch']: |
|
1965 | if opts['patch']: | |
1966 | prev = (parents and parents[0]) or nullid |
|
1966 | prev = (parents and parents[0]) or nullid | |
1967 | dodiff(ui, ui, other, prev, n) |
|
1967 | dodiff(ui, ui, other, prev, n) | |
1968 | ui.write("\n") |
|
1968 | ui.write("\n") | |
1969 | finally: |
|
1969 | finally: | |
1970 | if hasattr(other, 'close'): |
|
1970 | if hasattr(other, 'close'): | |
1971 | other.close() |
|
1971 | other.close() | |
1972 | if cleanup: |
|
1972 | if cleanup: | |
1973 | os.unlink(cleanup) |
|
1973 | os.unlink(cleanup) | |
1974 |
|
1974 | |||
1975 | def init(ui, dest=".", **opts): |
|
1975 | def init(ui, dest=".", **opts): | |
1976 | """create a new repository in the given directory |
|
1976 | """create a new repository in the given directory | |
1977 |
|
1977 | |||
1978 | Initialize a new repository in the given directory. If the given |
|
1978 | Initialize a new repository in the given directory. If the given | |
1979 | directory does not exist, it is created. |
|
1979 | directory does not exist, it is created. | |
1980 |
|
1980 | |||
1981 | If no directory is given, the current directory is used. |
|
1981 | If no directory is given, the current directory is used. | |
1982 |
|
1982 | |||
1983 | It is possible to specify an ssh:// URL as the destination. |
|
1983 | It is possible to specify an ssh:// URL as the destination. | |
1984 | Look at the help text for the pull command for important details |
|
1984 | Look at the help text for the pull command for important details | |
1985 | about ssh:// URLs. |
|
1985 | about ssh:// URLs. | |
1986 | """ |
|
1986 | """ | |
1987 | setremoteconfig(ui, opts) |
|
1987 | setremoteconfig(ui, opts) | |
1988 | hg.repository(ui, dest, create=1) |
|
1988 | hg.repository(ui, dest, create=1) | |
1989 |
|
1989 | |||
1990 | def locate(ui, repo, *pats, **opts): |
|
1990 | def locate(ui, repo, *pats, **opts): | |
1991 | """locate files matching specific patterns |
|
1991 | """locate files matching specific patterns | |
1992 |
|
1992 | |||
1993 | Print all files under Mercurial control whose names match the |
|
1993 | Print all files under Mercurial control whose names match the | |
1994 | given patterns. |
|
1994 | given patterns. | |
1995 |
|
1995 | |||
1996 | This command searches the current directory and its |
|
1996 | This command searches the current directory and its | |
1997 | subdirectories. To search an entire repository, move to the root |
|
1997 | subdirectories. To search an entire repository, move to the root | |
1998 | of the repository. |
|
1998 | of the repository. | |
1999 |
|
1999 | |||
2000 | If no patterns are given to match, this command prints all file |
|
2000 | If no patterns are given to match, this command prints all file | |
2001 | names. |
|
2001 | names. | |
2002 |
|
2002 | |||
2003 | If you want to feed the output of this command into the "xargs" |
|
2003 | If you want to feed the output of this command into the "xargs" | |
2004 | command, use the "-0" option to both this command and "xargs". |
|
2004 | command, use the "-0" option to both this command and "xargs". | |
2005 | This will avoid the problem of "xargs" treating single filenames |
|
2005 | This will avoid the problem of "xargs" treating single filenames | |
2006 | that contain white space as multiple filenames. |
|
2006 | that contain white space as multiple filenames. | |
2007 | """ |
|
2007 | """ | |
2008 | end = opts['print0'] and '\0' or '\n' |
|
2008 | end = opts['print0'] and '\0' or '\n' | |
2009 | rev = opts['rev'] |
|
2009 | rev = opts['rev'] | |
2010 | if rev: |
|
2010 | if rev: | |
2011 | node = repo.lookup(rev) |
|
2011 | node = repo.lookup(rev) | |
2012 | else: |
|
2012 | else: | |
2013 | node = None |
|
2013 | node = None | |
2014 |
|
2014 | |||
2015 | for src, abs, rel, exact in walk(repo, pats, opts, node=node, |
|
2015 | for src, abs, rel, exact in walk(repo, pats, opts, node=node, | |
2016 | head='(?:.*/|)'): |
|
2016 | head='(?:.*/|)'): | |
2017 | if not node and repo.dirstate.state(abs) == '?': |
|
2017 | if not node and repo.dirstate.state(abs) == '?': | |
2018 | continue |
|
2018 | continue | |
2019 | if opts['fullpath']: |
|
2019 | if opts['fullpath']: | |
2020 | ui.write(os.path.join(repo.root, abs), end) |
|
2020 | ui.write(os.path.join(repo.root, abs), end) | |
2021 | else: |
|
2021 | else: | |
2022 | ui.write(((pats and rel) or abs), end) |
|
2022 | ui.write(((pats and rel) or abs), end) | |
2023 |
|
2023 | |||
2024 | def log(ui, repo, *pats, **opts): |
|
2024 | def log(ui, repo, *pats, **opts): | |
2025 | """show revision history of entire repository or files |
|
2025 | """show revision history of entire repository or files | |
2026 |
|
2026 | |||
2027 | Print the revision history of the specified files or the entire |
|
2027 | Print the revision history of the specified files or the entire | |
2028 | project. |
|
2028 | project. | |
2029 |
|
2029 | |||
2030 | File history is shown without following rename or copy history of |
|
2030 | File history is shown without following rename or copy history of | |
2031 | files. Use -f/--follow with a file name to follow history across |
|
2031 | files. Use -f/--follow with a file name to follow history across | |
2032 | renames and copies. --follow without a file name will only show |
|
2032 | renames and copies. --follow without a file name will only show | |
2033 | ancestors or descendants of the starting revision. --follow-first |
|
2033 | ancestors or descendants of the starting revision. --follow-first | |
2034 | only follows the first parent of merge revisions. |
|
2034 | only follows the first parent of merge revisions. | |
2035 |
|
2035 | |||
2036 | If no revision range is specified, the default is tip:0 unless |
|
2036 | If no revision range is specified, the default is tip:0 unless | |
2037 | --follow is set, in which case the working directory parent is |
|
2037 | --follow is set, in which case the working directory parent is | |
2038 | used as the starting revision. |
|
2038 | used as the starting revision. | |
2039 |
|
2039 | |||
2040 | By default this command outputs: changeset id and hash, tags, |
|
2040 | By default this command outputs: changeset id and hash, tags, | |
2041 | non-trivial parents, user, date and time, and a summary for each |
|
2041 | non-trivial parents, user, date and time, and a summary for each | |
2042 | commit. When the -v/--verbose switch is used, the list of changed |
|
2042 | commit. When the -v/--verbose switch is used, the list of changed | |
2043 | files and full commit message is shown. |
|
2043 | files and full commit message is shown. | |
2044 | """ |
|
2044 | """ | |
2045 | class dui(object): |
|
2045 | class dui(object): | |
2046 | # Implement and delegate some ui protocol. Save hunks of |
|
2046 | # Implement and delegate some ui protocol. Save hunks of | |
2047 | # output for later display in the desired order. |
|
2047 | # output for later display in the desired order. | |
2048 | def __init__(self, ui): |
|
2048 | def __init__(self, ui): | |
2049 | self.ui = ui |
|
2049 | self.ui = ui | |
2050 | self.hunk = {} |
|
2050 | self.hunk = {} | |
2051 | self.header = {} |
|
2051 | self.header = {} | |
2052 | def bump(self, rev): |
|
2052 | def bump(self, rev): | |
2053 | self.rev = rev |
|
2053 | self.rev = rev | |
2054 | self.hunk[rev] = [] |
|
2054 | self.hunk[rev] = [] | |
2055 | self.header[rev] = [] |
|
2055 | self.header[rev] = [] | |
2056 | def note(self, *args): |
|
2056 | def note(self, *args): | |
2057 | if self.verbose: |
|
2057 | if self.verbose: | |
2058 | self.write(*args) |
|
2058 | self.write(*args) | |
2059 | def status(self, *args): |
|
2059 | def status(self, *args): | |
2060 | if not self.quiet: |
|
2060 | if not self.quiet: | |
2061 | self.write(*args) |
|
2061 | self.write(*args) | |
2062 | def write(self, *args): |
|
2062 | def write(self, *args): | |
2063 | self.hunk[self.rev].append(args) |
|
2063 | self.hunk[self.rev].append(args) | |
2064 | def write_header(self, *args): |
|
2064 | def write_header(self, *args): | |
2065 | self.header[self.rev].append(args) |
|
2065 | self.header[self.rev].append(args) | |
2066 | def debug(self, *args): |
|
2066 | def debug(self, *args): | |
2067 | if self.debugflag: |
|
2067 | if self.debugflag: | |
2068 | self.write(*args) |
|
2068 | self.write(*args) | |
2069 | def __getattr__(self, key): |
|
2069 | def __getattr__(self, key): | |
2070 | return getattr(self.ui, key) |
|
2070 | return getattr(self.ui, key) | |
2071 |
|
2071 | |||
2072 | changeiter, getchange, matchfn = walkchangerevs(ui, repo, pats, opts) |
|
2072 | changeiter, getchange, matchfn = walkchangerevs(ui, repo, pats, opts) | |
2073 |
|
2073 | |||
2074 | if opts['limit']: |
|
2074 | if opts['limit']: | |
2075 | try: |
|
2075 | try: | |
2076 | limit = int(opts['limit']) |
|
2076 | limit = int(opts['limit']) | |
2077 | except ValueError: |
|
2077 | except ValueError: | |
2078 | raise util.Abort(_('limit must be a positive integer')) |
|
2078 | raise util.Abort(_('limit must be a positive integer')) | |
2079 | if limit <= 0: raise util.Abort(_('limit must be positive')) |
|
2079 | if limit <= 0: raise util.Abort(_('limit must be positive')) | |
2080 | else: |
|
2080 | else: | |
2081 | limit = sys.maxint |
|
2081 | limit = sys.maxint | |
2082 | count = 0 |
|
2082 | count = 0 | |
2083 |
|
2083 | |||
2084 | displayer = show_changeset(ui, repo, opts) |
|
2084 | displayer = show_changeset(ui, repo, opts) | |
2085 | for st, rev, fns in changeiter: |
|
2085 | for st, rev, fns in changeiter: | |
2086 | if st == 'window': |
|
2086 | if st == 'window': | |
2087 | du = dui(ui) |
|
2087 | du = dui(ui) | |
2088 | displayer.ui = du |
|
2088 | displayer.ui = du | |
2089 | elif st == 'add': |
|
2089 | elif st == 'add': | |
2090 | du.bump(rev) |
|
2090 | du.bump(rev) | |
2091 | changenode = repo.changelog.node(rev) |
|
2091 | changenode = repo.changelog.node(rev) | |
2092 | parents = [p for p in repo.changelog.parents(changenode) |
|
2092 | parents = [p for p in repo.changelog.parents(changenode) | |
2093 | if p != nullid] |
|
2093 | if p != nullid] | |
2094 | if opts['no_merges'] and len(parents) == 2: |
|
2094 | if opts['no_merges'] and len(parents) == 2: | |
2095 | continue |
|
2095 | continue | |
2096 | if opts['only_merges'] and len(parents) != 2: |
|
2096 | if opts['only_merges'] and len(parents) != 2: | |
2097 | continue |
|
2097 | continue | |
2098 |
|
2098 | |||
2099 | if opts['keyword']: |
|
2099 | if opts['keyword']: | |
2100 | changes = getchange(rev) |
|
2100 | changes = getchange(rev) | |
2101 | miss = 0 |
|
2101 | miss = 0 | |
2102 | for k in [kw.lower() for kw in opts['keyword']]: |
|
2102 | for k in [kw.lower() for kw in opts['keyword']]: | |
2103 | if not (k in changes[1].lower() or |
|
2103 | if not (k in changes[1].lower() or | |
2104 | k in changes[4].lower() or |
|
2104 | k in changes[4].lower() or | |
2105 | k in " ".join(changes[3][:20]).lower()): |
|
2105 | k in " ".join(changes[3][:20]).lower()): | |
2106 | miss = 1 |
|
2106 | miss = 1 | |
2107 | break |
|
2107 | break | |
2108 | if miss: |
|
2108 | if miss: | |
2109 | continue |
|
2109 | continue | |
2110 |
|
2110 | |||
2111 | br = None |
|
2111 | br = None | |
2112 | if opts['branches']: |
|
2112 | if opts['branches']: | |
2113 | br = repo.branchlookup([repo.changelog.node(rev)]) |
|
2113 | br = repo.branchlookup([repo.changelog.node(rev)]) | |
2114 |
|
2114 | |||
2115 | displayer.show(rev, brinfo=br) |
|
2115 | displayer.show(rev, brinfo=br) | |
2116 | if opts['patch']: |
|
2116 | if opts['patch']: | |
2117 | prev = (parents and parents[0]) or nullid |
|
2117 | prev = (parents and parents[0]) or nullid | |
2118 | dodiff(du, du, repo, prev, changenode, match=matchfn) |
|
2118 | dodiff(du, du, repo, prev, changenode, match=matchfn) | |
2119 | du.write("\n\n") |
|
2119 | du.write("\n\n") | |
2120 | elif st == 'iter': |
|
2120 | elif st == 'iter': | |
2121 | if count == limit: break |
|
2121 | if count == limit: break | |
2122 | if du.header[rev]: |
|
2122 | if du.header[rev]: | |
2123 | for args in du.header[rev]: |
|
2123 | for args in du.header[rev]: | |
2124 | ui.write_header(*args) |
|
2124 | ui.write_header(*args) | |
2125 | if du.hunk[rev]: |
|
2125 | if du.hunk[rev]: | |
2126 | count += 1 |
|
2126 | count += 1 | |
2127 | for args in du.hunk[rev]: |
|
2127 | for args in du.hunk[rev]: | |
2128 | ui.write(*args) |
|
2128 | ui.write(*args) | |
2129 |
|
2129 | |||
2130 | def manifest(ui, repo, rev=None): |
|
2130 | def manifest(ui, repo, rev=None): | |
2131 | """output the latest or given revision of the project manifest |
|
2131 | """output the latest or given revision of the project manifest | |
2132 |
|
2132 | |||
2133 | Print a list of version controlled files for the given revision. |
|
2133 | Print a list of version controlled files for the given revision. | |
2134 |
|
2134 | |||
2135 | The manifest is the list of files being version controlled. If no revision |
|
2135 | The manifest is the list of files being version controlled. If no revision | |
2136 | is given then the tip is used. |
|
2136 | is given then the tip is used. | |
2137 | """ |
|
2137 | """ | |
2138 | if rev: |
|
2138 | if rev: | |
2139 | try: |
|
2139 | try: | |
2140 | # assume all revision numbers are for changesets |
|
2140 | # assume all revision numbers are for changesets | |
2141 | n = repo.lookup(rev) |
|
2141 | n = repo.lookup(rev) | |
2142 | change = repo.changelog.read(n) |
|
2142 | change = repo.changelog.read(n) | |
2143 | n = change[0] |
|
2143 | n = change[0] | |
2144 | except hg.RepoError: |
|
2144 | except hg.RepoError: | |
2145 | n = repo.manifest.lookup(rev) |
|
2145 | n = repo.manifest.lookup(rev) | |
2146 | else: |
|
2146 | else: | |
2147 | n = repo.manifest.tip() |
|
2147 | n = repo.manifest.tip() | |
2148 | m = repo.manifest.read(n) |
|
2148 | m = repo.manifest.read(n) | |
2149 | mf = repo.manifest.readflags(n) |
|
2149 | mf = repo.manifest.readflags(n) | |
2150 | files = m.keys() |
|
2150 | files = m.keys() | |
2151 | files.sort() |
|
2151 | files.sort() | |
2152 |
|
2152 | |||
2153 | for f in files: |
|
2153 | for f in files: | |
2154 | ui.write("%40s %3s %s\n" % (hex(m[f]), mf[f] and "755" or "644", f)) |
|
2154 | ui.write("%40s %3s %s\n" % (hex(m[f]), mf[f] and "755" or "644", f)) | |
2155 |
|
2155 | |||
2156 | def merge(ui, repo, node=None, force=None, branch=None): |
|
2156 | def merge(ui, repo, node=None, force=None, branch=None): | |
2157 | """Merge working directory with another revision |
|
2157 | """Merge working directory with another revision | |
2158 |
|
2158 | |||
2159 | Merge the contents of the current working directory and the |
|
2159 | Merge the contents of the current working directory and the | |
2160 | requested revision. Files that changed between either parent are |
|
2160 | requested revision. Files that changed between either parent are | |
2161 | marked as changed for the next commit and a commit must be |
|
2161 | marked as changed for the next commit and a commit must be | |
2162 | performed before any further updates are allowed. |
|
2162 | performed before any further updates are allowed. | |
2163 | """ |
|
2163 | """ | |
2164 |
|
2164 | |||
2165 | node = _lookup(repo, node, branch) |
|
2165 | node = _lookup(repo, node, branch) | |
2166 |
hg. |
|
2166 | return hg.merge(repo, node, force=force) | |
2167 |
|
2167 | |||
2168 | def outgoing(ui, repo, dest=None, **opts): |
|
2168 | def outgoing(ui, repo, dest=None, **opts): | |
2169 | """show changesets not found in destination |
|
2169 | """show changesets not found in destination | |
2170 |
|
2170 | |||
2171 | Show changesets not found in the specified destination repository or |
|
2171 | Show changesets not found in the specified destination repository or | |
2172 | the default push location. These are the changesets that would be pushed |
|
2172 | the default push location. These are the changesets that would be pushed | |
2173 | if a push was requested. |
|
2173 | if a push was requested. | |
2174 |
|
2174 | |||
2175 | See pull for valid destination format details. |
|
2175 | See pull for valid destination format details. | |
2176 | """ |
|
2176 | """ | |
2177 | dest = ui.expandpath(dest or 'default-push', dest or 'default') |
|
2177 | dest = ui.expandpath(dest or 'default-push', dest or 'default') | |
2178 | setremoteconfig(ui, opts) |
|
2178 | setremoteconfig(ui, opts) | |
2179 | revs = None |
|
2179 | revs = None | |
2180 | if opts['rev']: |
|
2180 | if opts['rev']: | |
2181 | revs = [repo.lookup(rev) for rev in opts['rev']] |
|
2181 | revs = [repo.lookup(rev) for rev in opts['rev']] | |
2182 |
|
2182 | |||
2183 | other = hg.repository(ui, dest) |
|
2183 | other = hg.repository(ui, dest) | |
2184 | o = repo.findoutgoing(other, force=opts['force']) |
|
2184 | o = repo.findoutgoing(other, force=opts['force']) | |
2185 | if not o: |
|
2185 | if not o: | |
2186 | ui.status(_("no changes found\n")) |
|
2186 | ui.status(_("no changes found\n")) | |
2187 | return |
|
2187 | return | |
2188 | o = repo.changelog.nodesbetween(o, revs)[0] |
|
2188 | o = repo.changelog.nodesbetween(o, revs)[0] | |
2189 | if opts['newest_first']: |
|
2189 | if opts['newest_first']: | |
2190 | o.reverse() |
|
2190 | o.reverse() | |
2191 | displayer = show_changeset(ui, repo, opts) |
|
2191 | displayer = show_changeset(ui, repo, opts) | |
2192 | for n in o: |
|
2192 | for n in o: | |
2193 | parents = [p for p in repo.changelog.parents(n) if p != nullid] |
|
2193 | parents = [p for p in repo.changelog.parents(n) if p != nullid] | |
2194 | if opts['no_merges'] and len(parents) == 2: |
|
2194 | if opts['no_merges'] and len(parents) == 2: | |
2195 | continue |
|
2195 | continue | |
2196 | displayer.show(changenode=n) |
|
2196 | displayer.show(changenode=n) | |
2197 | if opts['patch']: |
|
2197 | if opts['patch']: | |
2198 | prev = (parents and parents[0]) or nullid |
|
2198 | prev = (parents and parents[0]) or nullid | |
2199 | dodiff(ui, ui, repo, prev, n) |
|
2199 | dodiff(ui, ui, repo, prev, n) | |
2200 | ui.write("\n") |
|
2200 | ui.write("\n") | |
2201 |
|
2201 | |||
2202 | def parents(ui, repo, file_=None, rev=None, branches=None, **opts): |
|
2202 | def parents(ui, repo, file_=None, rev=None, branches=None, **opts): | |
2203 | """show the parents of the working dir or revision |
|
2203 | """show the parents of the working dir or revision | |
2204 |
|
2204 | |||
2205 | Print the working directory's parent revisions. |
|
2205 | Print the working directory's parent revisions. | |
2206 | """ |
|
2206 | """ | |
2207 | # legacy |
|
2207 | # legacy | |
2208 | if file_ and not rev: |
|
2208 | if file_ and not rev: | |
2209 | try: |
|
2209 | try: | |
2210 | rev = repo.lookup(file_) |
|
2210 | rev = repo.lookup(file_) | |
2211 | file_ = None |
|
2211 | file_ = None | |
2212 | except hg.RepoError: |
|
2212 | except hg.RepoError: | |
2213 | pass |
|
2213 | pass | |
2214 | else: |
|
2214 | else: | |
2215 | ui.warn(_("'hg parent REV' is deprecated, " |
|
2215 | ui.warn(_("'hg parent REV' is deprecated, " | |
2216 | "please use 'hg parents -r REV instead\n")) |
|
2216 | "please use 'hg parents -r REV instead\n")) | |
2217 |
|
2217 | |||
2218 | if rev: |
|
2218 | if rev: | |
2219 | if file_: |
|
2219 | if file_: | |
2220 | ctx = repo.filectx(file_, changeid=rev) |
|
2220 | ctx = repo.filectx(file_, changeid=rev) | |
2221 | else: |
|
2221 | else: | |
2222 | ctx = repo.changectx(rev) |
|
2222 | ctx = repo.changectx(rev) | |
2223 | p = [cp.node() for cp in ctx.parents()] |
|
2223 | p = [cp.node() for cp in ctx.parents()] | |
2224 | else: |
|
2224 | else: | |
2225 | p = repo.dirstate.parents() |
|
2225 | p = repo.dirstate.parents() | |
2226 |
|
2226 | |||
2227 | br = None |
|
2227 | br = None | |
2228 | if branches is not None: |
|
2228 | if branches is not None: | |
2229 | br = repo.branchlookup(p) |
|
2229 | br = repo.branchlookup(p) | |
2230 | displayer = show_changeset(ui, repo, opts) |
|
2230 | displayer = show_changeset(ui, repo, opts) | |
2231 | for n in p: |
|
2231 | for n in p: | |
2232 | if n != nullid: |
|
2232 | if n != nullid: | |
2233 | displayer.show(changenode=n, brinfo=br) |
|
2233 | displayer.show(changenode=n, brinfo=br) | |
2234 |
|
2234 | |||
2235 | def paths(ui, repo, search=None): |
|
2235 | def paths(ui, repo, search=None): | |
2236 | """show definition of symbolic path names |
|
2236 | """show definition of symbolic path names | |
2237 |
|
2237 | |||
2238 | Show definition of symbolic path name NAME. If no name is given, show |
|
2238 | Show definition of symbolic path name NAME. If no name is given, show | |
2239 | definition of available names. |
|
2239 | definition of available names. | |
2240 |
|
2240 | |||
2241 | Path names are defined in the [paths] section of /etc/mercurial/hgrc |
|
2241 | Path names are defined in the [paths] section of /etc/mercurial/hgrc | |
2242 | and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too. |
|
2242 | and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too. | |
2243 | """ |
|
2243 | """ | |
2244 | if search: |
|
2244 | if search: | |
2245 | for name, path in ui.configitems("paths"): |
|
2245 | for name, path in ui.configitems("paths"): | |
2246 | if name == search: |
|
2246 | if name == search: | |
2247 | ui.write("%s\n" % path) |
|
2247 | ui.write("%s\n" % path) | |
2248 | return |
|
2248 | return | |
2249 | ui.warn(_("not found!\n")) |
|
2249 | ui.warn(_("not found!\n")) | |
2250 | return 1 |
|
2250 | return 1 | |
2251 | else: |
|
2251 | else: | |
2252 | for name, path in ui.configitems("paths"): |
|
2252 | for name, path in ui.configitems("paths"): | |
2253 | ui.write("%s = %s\n" % (name, path)) |
|
2253 | ui.write("%s = %s\n" % (name, path)) | |
2254 |
|
2254 | |||
2255 | def postincoming(ui, repo, modheads, optupdate): |
|
2255 | def postincoming(ui, repo, modheads, optupdate): | |
2256 | if modheads == 0: |
|
2256 | if modheads == 0: | |
2257 | return |
|
2257 | return | |
2258 | if optupdate: |
|
2258 | if optupdate: | |
2259 | if modheads == 1: |
|
2259 | if modheads == 1: | |
2260 | return hg.update(repo, repo.changelog.tip()) # update |
|
2260 | return hg.update(repo, repo.changelog.tip()) # update | |
2261 | else: |
|
2261 | else: | |
2262 | ui.status(_("not updating, since new heads added\n")) |
|
2262 | ui.status(_("not updating, since new heads added\n")) | |
2263 | if modheads > 1: |
|
2263 | if modheads > 1: | |
2264 | ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n")) |
|
2264 | ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n")) | |
2265 | else: |
|
2265 | else: | |
2266 | ui.status(_("(run 'hg update' to get a working copy)\n")) |
|
2266 | ui.status(_("(run 'hg update' to get a working copy)\n")) | |
2267 |
|
2267 | |||
2268 | def pull(ui, repo, source="default", **opts): |
|
2268 | def pull(ui, repo, source="default", **opts): | |
2269 | """pull changes from the specified source |
|
2269 | """pull changes from the specified source | |
2270 |
|
2270 | |||
2271 | Pull changes from a remote repository to a local one. |
|
2271 | Pull changes from a remote repository to a local one. | |
2272 |
|
2272 | |||
2273 | This finds all changes from the repository at the specified path |
|
2273 | This finds all changes from the repository at the specified path | |
2274 | or URL and adds them to the local repository. By default, this |
|
2274 | or URL and adds them to the local repository. By default, this | |
2275 | does not update the copy of the project in the working directory. |
|
2275 | does not update the copy of the project in the working directory. | |
2276 |
|
2276 | |||
2277 | Valid URLs are of the form: |
|
2277 | Valid URLs are of the form: | |
2278 |
|
2278 | |||
2279 | local/filesystem/path |
|
2279 | local/filesystem/path | |
2280 | http://[user@]host[:port]/[path] |
|
2280 | http://[user@]host[:port]/[path] | |
2281 | https://[user@]host[:port]/[path] |
|
2281 | https://[user@]host[:port]/[path] | |
2282 | ssh://[user@]host[:port]/[path] |
|
2282 | ssh://[user@]host[:port]/[path] | |
2283 |
|
2283 | |||
2284 | Some notes about using SSH with Mercurial: |
|
2284 | Some notes about using SSH with Mercurial: | |
2285 | - SSH requires an accessible shell account on the destination machine |
|
2285 | - SSH requires an accessible shell account on the destination machine | |
2286 | and a copy of hg in the remote path or specified with as remotecmd. |
|
2286 | and a copy of hg in the remote path or specified with as remotecmd. | |
2287 | - path is relative to the remote user's home directory by default. |
|
2287 | - path is relative to the remote user's home directory by default. | |
2288 | Use an extra slash at the start of a path to specify an absolute path: |
|
2288 | Use an extra slash at the start of a path to specify an absolute path: | |
2289 | ssh://example.com//tmp/repository |
|
2289 | ssh://example.com//tmp/repository | |
2290 | - Mercurial doesn't use its own compression via SSH; the right thing |
|
2290 | - Mercurial doesn't use its own compression via SSH; the right thing | |
2291 | to do is to configure it in your ~/.ssh/ssh_config, e.g.: |
|
2291 | to do is to configure it in your ~/.ssh/ssh_config, e.g.: | |
2292 | Host *.mylocalnetwork.example.com |
|
2292 | Host *.mylocalnetwork.example.com | |
2293 | Compression off |
|
2293 | Compression off | |
2294 | Host * |
|
2294 | Host * | |
2295 | Compression on |
|
2295 | Compression on | |
2296 | Alternatively specify "ssh -C" as your ssh command in your hgrc or |
|
2296 | Alternatively specify "ssh -C" as your ssh command in your hgrc or | |
2297 | with the --ssh command line option. |
|
2297 | with the --ssh command line option. | |
2298 | """ |
|
2298 | """ | |
2299 | source = ui.expandpath(source) |
|
2299 | source = ui.expandpath(source) | |
2300 | setremoteconfig(ui, opts) |
|
2300 | setremoteconfig(ui, opts) | |
2301 |
|
2301 | |||
2302 | other = hg.repository(ui, source) |
|
2302 | other = hg.repository(ui, source) | |
2303 | ui.status(_('pulling from %s\n') % (source)) |
|
2303 | ui.status(_('pulling from %s\n') % (source)) | |
2304 | revs = None |
|
2304 | revs = None | |
2305 | if opts['rev'] and not other.local(): |
|
2305 | if opts['rev'] and not other.local(): | |
2306 | raise util.Abort(_("pull -r doesn't work for remote repositories yet")) |
|
2306 | raise util.Abort(_("pull -r doesn't work for remote repositories yet")) | |
2307 | elif opts['rev']: |
|
2307 | elif opts['rev']: | |
2308 | revs = [other.lookup(rev) for rev in opts['rev']] |
|
2308 | revs = [other.lookup(rev) for rev in opts['rev']] | |
2309 | modheads = repo.pull(other, heads=revs, force=opts['force']) |
|
2309 | modheads = repo.pull(other, heads=revs, force=opts['force']) | |
2310 | return postincoming(ui, repo, modheads, opts['update']) |
|
2310 | return postincoming(ui, repo, modheads, opts['update']) | |
2311 |
|
2311 | |||
2312 | def push(ui, repo, dest=None, **opts): |
|
2312 | def push(ui, repo, dest=None, **opts): | |
2313 | """push changes to the specified destination |
|
2313 | """push changes to the specified destination | |
2314 |
|
2314 | |||
2315 | Push changes from the local repository to the given destination. |
|
2315 | Push changes from the local repository to the given destination. | |
2316 |
|
2316 | |||
2317 | This is the symmetrical operation for pull. It helps to move |
|
2317 | This is the symmetrical operation for pull. It helps to move | |
2318 | changes from the current repository to a different one. If the |
|
2318 | changes from the current repository to a different one. If the | |
2319 | destination is local this is identical to a pull in that directory |
|
2319 | destination is local this is identical to a pull in that directory | |
2320 | from the current one. |
|
2320 | from the current one. | |
2321 |
|
2321 | |||
2322 | By default, push will refuse to run if it detects the result would |
|
2322 | By default, push will refuse to run if it detects the result would | |
2323 | increase the number of remote heads. This generally indicates the |
|
2323 | increase the number of remote heads. This generally indicates the | |
2324 | the client has forgotten to sync and merge before pushing. |
|
2324 | the client has forgotten to sync and merge before pushing. | |
2325 |
|
2325 | |||
2326 | Valid URLs are of the form: |
|
2326 | Valid URLs are of the form: | |
2327 |
|
2327 | |||
2328 | local/filesystem/path |
|
2328 | local/filesystem/path | |
2329 | ssh://[user@]host[:port]/[path] |
|
2329 | ssh://[user@]host[:port]/[path] | |
2330 |
|
2330 | |||
2331 | Look at the help text for the pull command for important details |
|
2331 | Look at the help text for the pull command for important details | |
2332 | about ssh:// URLs. |
|
2332 | about ssh:// URLs. | |
2333 |
|
2333 | |||
2334 | Pushing to http:// and https:// URLs is possible, too, if this |
|
2334 | Pushing to http:// and https:// URLs is possible, too, if this | |
2335 | feature is enabled on the remote Mercurial server. |
|
2335 | feature is enabled on the remote Mercurial server. | |
2336 | """ |
|
2336 | """ | |
2337 | dest = ui.expandpath(dest or 'default-push', dest or 'default') |
|
2337 | dest = ui.expandpath(dest or 'default-push', dest or 'default') | |
2338 | setremoteconfig(ui, opts) |
|
2338 | setremoteconfig(ui, opts) | |
2339 |
|
2339 | |||
2340 | other = hg.repository(ui, dest) |
|
2340 | other = hg.repository(ui, dest) | |
2341 | ui.status('pushing to %s\n' % (dest)) |
|
2341 | ui.status('pushing to %s\n' % (dest)) | |
2342 | revs = None |
|
2342 | revs = None | |
2343 | if opts['rev']: |
|
2343 | if opts['rev']: | |
2344 | revs = [repo.lookup(rev) for rev in opts['rev']] |
|
2344 | revs = [repo.lookup(rev) for rev in opts['rev']] | |
2345 | r = repo.push(other, opts['force'], revs=revs) |
|
2345 | r = repo.push(other, opts['force'], revs=revs) | |
2346 | return r == 0 |
|
2346 | return r == 0 | |
2347 |
|
2347 | |||
2348 | def rawcommit(ui, repo, *flist, **rc): |
|
2348 | def rawcommit(ui, repo, *flist, **rc): | |
2349 | """raw commit interface (DEPRECATED) |
|
2349 | """raw commit interface (DEPRECATED) | |
2350 |
|
2350 | |||
2351 | (DEPRECATED) |
|
2351 | (DEPRECATED) | |
2352 | Lowlevel commit, for use in helper scripts. |
|
2352 | Lowlevel commit, for use in helper scripts. | |
2353 |
|
2353 | |||
2354 | This command is not intended to be used by normal users, as it is |
|
2354 | This command is not intended to be used by normal users, as it is | |
2355 | primarily useful for importing from other SCMs. |
|
2355 | primarily useful for importing from other SCMs. | |
2356 |
|
2356 | |||
2357 | This command is now deprecated and will be removed in a future |
|
2357 | This command is now deprecated and will be removed in a future | |
2358 | release, please use debugsetparents and commit instead. |
|
2358 | release, please use debugsetparents and commit instead. | |
2359 | """ |
|
2359 | """ | |
2360 |
|
2360 | |||
2361 | ui.warn(_("(the rawcommit command is deprecated)\n")) |
|
2361 | ui.warn(_("(the rawcommit command is deprecated)\n")) | |
2362 |
|
2362 | |||
2363 | message = rc['message'] |
|
2363 | message = rc['message'] | |
2364 | if not message and rc['logfile']: |
|
2364 | if not message and rc['logfile']: | |
2365 | try: |
|
2365 | try: | |
2366 | message = open(rc['logfile']).read() |
|
2366 | message = open(rc['logfile']).read() | |
2367 | except IOError: |
|
2367 | except IOError: | |
2368 | pass |
|
2368 | pass | |
2369 | if not message and not rc['logfile']: |
|
2369 | if not message and not rc['logfile']: | |
2370 | raise util.Abort(_("missing commit message")) |
|
2370 | raise util.Abort(_("missing commit message")) | |
2371 |
|
2371 | |||
2372 | files = relpath(repo, list(flist)) |
|
2372 | files = relpath(repo, list(flist)) | |
2373 | if rc['files']: |
|
2373 | if rc['files']: | |
2374 | files += open(rc['files']).read().splitlines() |
|
2374 | files += open(rc['files']).read().splitlines() | |
2375 |
|
2375 | |||
2376 | rc['parent'] = map(repo.lookup, rc['parent']) |
|
2376 | rc['parent'] = map(repo.lookup, rc['parent']) | |
2377 |
|
2377 | |||
2378 | try: |
|
2378 | try: | |
2379 | repo.rawcommit(files, message, rc['user'], rc['date'], *rc['parent']) |
|
2379 | repo.rawcommit(files, message, rc['user'], rc['date'], *rc['parent']) | |
2380 | except ValueError, inst: |
|
2380 | except ValueError, inst: | |
2381 | raise util.Abort(str(inst)) |
|
2381 | raise util.Abort(str(inst)) | |
2382 |
|
2382 | |||
2383 | def recover(ui, repo): |
|
2383 | def recover(ui, repo): | |
2384 | """roll back an interrupted transaction |
|
2384 | """roll back an interrupted transaction | |
2385 |
|
2385 | |||
2386 | Recover from an interrupted commit or pull. |
|
2386 | Recover from an interrupted commit or pull. | |
2387 |
|
2387 | |||
2388 | This command tries to fix the repository status after an interrupted |
|
2388 | This command tries to fix the repository status after an interrupted | |
2389 | operation. It should only be necessary when Mercurial suggests it. |
|
2389 | operation. It should only be necessary when Mercurial suggests it. | |
2390 | """ |
|
2390 | """ | |
2391 | if repo.recover(): |
|
2391 | if repo.recover(): | |
2392 | return hg.verify(repo) |
|
2392 | return hg.verify(repo) | |
2393 | return 1 |
|
2393 | return 1 | |
2394 |
|
2394 | |||
2395 | def remove(ui, repo, *pats, **opts): |
|
2395 | def remove(ui, repo, *pats, **opts): | |
2396 | """remove the specified files on the next commit |
|
2396 | """remove the specified files on the next commit | |
2397 |
|
2397 | |||
2398 | Schedule the indicated files for removal from the repository. |
|
2398 | Schedule the indicated files for removal from the repository. | |
2399 |
|
2399 | |||
2400 | This command schedules the files to be removed at the next commit. |
|
2400 | This command schedules the files to be removed at the next commit. | |
2401 | This only removes files from the current branch, not from the |
|
2401 | This only removes files from the current branch, not from the | |
2402 | entire project history. If the files still exist in the working |
|
2402 | entire project history. If the files still exist in the working | |
2403 | directory, they will be deleted from it. If invoked with --after, |
|
2403 | directory, they will be deleted from it. If invoked with --after, | |
2404 | files that have been manually deleted are marked as removed. |
|
2404 | files that have been manually deleted are marked as removed. | |
2405 |
|
2405 | |||
2406 | Modified files and added files are not removed by default. To |
|
2406 | Modified files and added files are not removed by default. To | |
2407 | remove them, use the -f/--force option. |
|
2407 | remove them, use the -f/--force option. | |
2408 | """ |
|
2408 | """ | |
2409 | names = [] |
|
2409 | names = [] | |
2410 | if not opts['after'] and not pats: |
|
2410 | if not opts['after'] and not pats: | |
2411 | raise util.Abort(_('no files specified')) |
|
2411 | raise util.Abort(_('no files specified')) | |
2412 | files, matchfn, anypats = matchpats(repo, pats, opts) |
|
2412 | files, matchfn, anypats = matchpats(repo, pats, opts) | |
2413 | exact = dict.fromkeys(files) |
|
2413 | exact = dict.fromkeys(files) | |
2414 | mardu = map(dict.fromkeys, repo.changes(files=files, match=matchfn)) |
|
2414 | mardu = map(dict.fromkeys, repo.changes(files=files, match=matchfn)) | |
2415 | modified, added, removed, deleted, unknown = mardu |
|
2415 | modified, added, removed, deleted, unknown = mardu | |
2416 | remove, forget = [], [] |
|
2416 | remove, forget = [], [] | |
2417 | for src, abs, rel, exact in walk(repo, pats, opts): |
|
2417 | for src, abs, rel, exact in walk(repo, pats, opts): | |
2418 | reason = None |
|
2418 | reason = None | |
2419 | if abs not in deleted and opts['after']: |
|
2419 | if abs not in deleted and opts['after']: | |
2420 | reason = _('is still present') |
|
2420 | reason = _('is still present') | |
2421 | elif abs in modified and not opts['force']: |
|
2421 | elif abs in modified and not opts['force']: | |
2422 | reason = _('is modified (use -f to force removal)') |
|
2422 | reason = _('is modified (use -f to force removal)') | |
2423 | elif abs in added: |
|
2423 | elif abs in added: | |
2424 | if opts['force']: |
|
2424 | if opts['force']: | |
2425 | forget.append(abs) |
|
2425 | forget.append(abs) | |
2426 | continue |
|
2426 | continue | |
2427 | reason = _('has been marked for add (use -f to force removal)') |
|
2427 | reason = _('has been marked for add (use -f to force removal)') | |
2428 | elif abs in unknown: |
|
2428 | elif abs in unknown: | |
2429 | reason = _('is not managed') |
|
2429 | reason = _('is not managed') | |
2430 | elif abs in removed: |
|
2430 | elif abs in removed: | |
2431 | continue |
|
2431 | continue | |
2432 | if reason: |
|
2432 | if reason: | |
2433 | if exact: |
|
2433 | if exact: | |
2434 | ui.warn(_('not removing %s: file %s\n') % (rel, reason)) |
|
2434 | ui.warn(_('not removing %s: file %s\n') % (rel, reason)) | |
2435 | else: |
|
2435 | else: | |
2436 | if ui.verbose or not exact: |
|
2436 | if ui.verbose or not exact: | |
2437 | ui.status(_('removing %s\n') % rel) |
|
2437 | ui.status(_('removing %s\n') % rel) | |
2438 | remove.append(abs) |
|
2438 | remove.append(abs) | |
2439 | repo.forget(forget) |
|
2439 | repo.forget(forget) | |
2440 | repo.remove(remove, unlink=not opts['after']) |
|
2440 | repo.remove(remove, unlink=not opts['after']) | |
2441 |
|
2441 | |||
2442 | def rename(ui, repo, *pats, **opts): |
|
2442 | def rename(ui, repo, *pats, **opts): | |
2443 | """rename files; equivalent of copy + remove |
|
2443 | """rename files; equivalent of copy + remove | |
2444 |
|
2444 | |||
2445 | Mark dest as copies of sources; mark sources for deletion. If |
|
2445 | Mark dest as copies of sources; mark sources for deletion. If | |
2446 | dest is a directory, copies are put in that directory. If dest is |
|
2446 | dest is a directory, copies are put in that directory. If dest is | |
2447 | a file, there can only be one source. |
|
2447 | a file, there can only be one source. | |
2448 |
|
2448 | |||
2449 | By default, this command copies the contents of files as they |
|
2449 | By default, this command copies the contents of files as they | |
2450 | stand in the working directory. If invoked with --after, the |
|
2450 | stand in the working directory. If invoked with --after, the | |
2451 | operation is recorded, but no copying is performed. |
|
2451 | operation is recorded, but no copying is performed. | |
2452 |
|
2452 | |||
2453 | This command takes effect in the next commit. |
|
2453 | This command takes effect in the next commit. | |
2454 |
|
2454 | |||
2455 | NOTE: This command should be treated as experimental. While it |
|
2455 | NOTE: This command should be treated as experimental. While it | |
2456 | should properly record rename files, this information is not yet |
|
2456 | should properly record rename files, this information is not yet | |
2457 | fully used by merge, nor fully reported by log. |
|
2457 | fully used by merge, nor fully reported by log. | |
2458 | """ |
|
2458 | """ | |
2459 | wlock = repo.wlock(0) |
|
2459 | wlock = repo.wlock(0) | |
2460 | errs, copied = docopy(ui, repo, pats, opts, wlock) |
|
2460 | errs, copied = docopy(ui, repo, pats, opts, wlock) | |
2461 | names = [] |
|
2461 | names = [] | |
2462 | for abs, rel, exact in copied: |
|
2462 | for abs, rel, exact in copied: | |
2463 | if ui.verbose or not exact: |
|
2463 | if ui.verbose or not exact: | |
2464 | ui.status(_('removing %s\n') % rel) |
|
2464 | ui.status(_('removing %s\n') % rel) | |
2465 | names.append(abs) |
|
2465 | names.append(abs) | |
2466 | if not opts.get('dry_run'): |
|
2466 | if not opts.get('dry_run'): | |
2467 | repo.remove(names, True, wlock) |
|
2467 | repo.remove(names, True, wlock) | |
2468 | return errs |
|
2468 | return errs | |
2469 |
|
2469 | |||
2470 | def revert(ui, repo, *pats, **opts): |
|
2470 | def revert(ui, repo, *pats, **opts): | |
2471 | """revert files or dirs to their states as of some revision |
|
2471 | """revert files or dirs to their states as of some revision | |
2472 |
|
2472 | |||
2473 | With no revision specified, revert the named files or directories |
|
2473 | With no revision specified, revert the named files or directories | |
2474 | to the contents they had in the parent of the working directory. |
|
2474 | to the contents they had in the parent of the working directory. | |
2475 | This restores the contents of the affected files to an unmodified |
|
2475 | This restores the contents of the affected files to an unmodified | |
2476 | state. If the working directory has two parents, you must |
|
2476 | state. If the working directory has two parents, you must | |
2477 | explicitly specify the revision to revert to. |
|
2477 | explicitly specify the revision to revert to. | |
2478 |
|
2478 | |||
2479 | Modified files are saved with a .orig suffix before reverting. |
|
2479 | Modified files are saved with a .orig suffix before reverting. | |
2480 | To disable these backups, use --no-backup. |
|
2480 | To disable these backups, use --no-backup. | |
2481 |
|
2481 | |||
2482 | Using the -r option, revert the given files or directories to |
|
2482 | Using the -r option, revert the given files or directories to | |
2483 | their contents as of a specific revision. This can be helpful to"roll |
|
2483 | their contents as of a specific revision. This can be helpful to"roll | |
2484 | back" some or all of a change that should not have been committed. |
|
2484 | back" some or all of a change that should not have been committed. | |
2485 |
|
2485 | |||
2486 | Revert modifies the working directory. It does not commit any |
|
2486 | Revert modifies the working directory. It does not commit any | |
2487 | changes, or change the parent of the working directory. If you |
|
2487 | changes, or change the parent of the working directory. If you | |
2488 | revert to a revision other than the parent of the working |
|
2488 | revert to a revision other than the parent of the working | |
2489 | directory, the reverted files will thus appear modified |
|
2489 | directory, the reverted files will thus appear modified | |
2490 | afterwards. |
|
2490 | afterwards. | |
2491 |
|
2491 | |||
2492 | If a file has been deleted, it is recreated. If the executable |
|
2492 | If a file has been deleted, it is recreated. If the executable | |
2493 | mode of a file was changed, it is reset. |
|
2493 | mode of a file was changed, it is reset. | |
2494 |
|
2494 | |||
2495 | If names are given, all files matching the names are reverted. |
|
2495 | If names are given, all files matching the names are reverted. | |
2496 |
|
2496 | |||
2497 | If no arguments are given, all files in the repository are reverted. |
|
2497 | If no arguments are given, all files in the repository are reverted. | |
2498 | """ |
|
2498 | """ | |
2499 | parent, p2 = repo.dirstate.parents() |
|
2499 | parent, p2 = repo.dirstate.parents() | |
2500 | if opts['rev']: |
|
2500 | if opts['rev']: | |
2501 | node = repo.lookup(opts['rev']) |
|
2501 | node = repo.lookup(opts['rev']) | |
2502 | elif p2 != nullid: |
|
2502 | elif p2 != nullid: | |
2503 | raise util.Abort(_('working dir has two parents; ' |
|
2503 | raise util.Abort(_('working dir has two parents; ' | |
2504 | 'you must specify the revision to revert to')) |
|
2504 | 'you must specify the revision to revert to')) | |
2505 | else: |
|
2505 | else: | |
2506 | node = parent |
|
2506 | node = parent | |
2507 | mf = repo.manifest.read(repo.changelog.read(node)[0]) |
|
2507 | mf = repo.manifest.read(repo.changelog.read(node)[0]) | |
2508 | if node == parent: |
|
2508 | if node == parent: | |
2509 | pmf = mf |
|
2509 | pmf = mf | |
2510 | else: |
|
2510 | else: | |
2511 | pmf = None |
|
2511 | pmf = None | |
2512 |
|
2512 | |||
2513 | wlock = repo.wlock() |
|
2513 | wlock = repo.wlock() | |
2514 |
|
2514 | |||
2515 | # need all matching names in dirstate and manifest of target rev, |
|
2515 | # need all matching names in dirstate and manifest of target rev, | |
2516 | # so have to walk both. do not print errors if files exist in one |
|
2516 | # so have to walk both. do not print errors if files exist in one | |
2517 | # but not other. |
|
2517 | # but not other. | |
2518 |
|
2518 | |||
2519 | names = {} |
|
2519 | names = {} | |
2520 | target_only = {} |
|
2520 | target_only = {} | |
2521 |
|
2521 | |||
2522 | # walk dirstate. |
|
2522 | # walk dirstate. | |
2523 |
|
2523 | |||
2524 | for src, abs, rel, exact in walk(repo, pats, opts, badmatch=mf.has_key): |
|
2524 | for src, abs, rel, exact in walk(repo, pats, opts, badmatch=mf.has_key): | |
2525 | names[abs] = (rel, exact) |
|
2525 | names[abs] = (rel, exact) | |
2526 | if src == 'b': |
|
2526 | if src == 'b': | |
2527 | target_only[abs] = True |
|
2527 | target_only[abs] = True | |
2528 |
|
2528 | |||
2529 | # walk target manifest. |
|
2529 | # walk target manifest. | |
2530 |
|
2530 | |||
2531 | for src, abs, rel, exact in walk(repo, pats, opts, node=node, |
|
2531 | for src, abs, rel, exact in walk(repo, pats, opts, node=node, | |
2532 | badmatch=names.has_key): |
|
2532 | badmatch=names.has_key): | |
2533 | if abs in names: continue |
|
2533 | if abs in names: continue | |
2534 | names[abs] = (rel, exact) |
|
2534 | names[abs] = (rel, exact) | |
2535 | target_only[abs] = True |
|
2535 | target_only[abs] = True | |
2536 |
|
2536 | |||
2537 | changes = repo.changes(match=names.has_key, wlock=wlock) |
|
2537 | changes = repo.changes(match=names.has_key, wlock=wlock) | |
2538 | modified, added, removed, deleted, unknown = map(dict.fromkeys, changes) |
|
2538 | modified, added, removed, deleted, unknown = map(dict.fromkeys, changes) | |
2539 |
|
2539 | |||
2540 | revert = ([], _('reverting %s\n')) |
|
2540 | revert = ([], _('reverting %s\n')) | |
2541 | add = ([], _('adding %s\n')) |
|
2541 | add = ([], _('adding %s\n')) | |
2542 | remove = ([], _('removing %s\n')) |
|
2542 | remove = ([], _('removing %s\n')) | |
2543 | forget = ([], _('forgetting %s\n')) |
|
2543 | forget = ([], _('forgetting %s\n')) | |
2544 | undelete = ([], _('undeleting %s\n')) |
|
2544 | undelete = ([], _('undeleting %s\n')) | |
2545 | update = {} |
|
2545 | update = {} | |
2546 |
|
2546 | |||
2547 | disptable = ( |
|
2547 | disptable = ( | |
2548 | # dispatch table: |
|
2548 | # dispatch table: | |
2549 | # file state |
|
2549 | # file state | |
2550 | # action if in target manifest |
|
2550 | # action if in target manifest | |
2551 | # action if not in target manifest |
|
2551 | # action if not in target manifest | |
2552 | # make backup if in target manifest |
|
2552 | # make backup if in target manifest | |
2553 | # make backup if not in target manifest |
|
2553 | # make backup if not in target manifest | |
2554 | (modified, revert, remove, True, True), |
|
2554 | (modified, revert, remove, True, True), | |
2555 | (added, revert, forget, True, False), |
|
2555 | (added, revert, forget, True, False), | |
2556 | (removed, undelete, None, False, False), |
|
2556 | (removed, undelete, None, False, False), | |
2557 | (deleted, revert, remove, False, False), |
|
2557 | (deleted, revert, remove, False, False), | |
2558 | (unknown, add, None, True, False), |
|
2558 | (unknown, add, None, True, False), | |
2559 | (target_only, add, None, False, False), |
|
2559 | (target_only, add, None, False, False), | |
2560 | ) |
|
2560 | ) | |
2561 |
|
2561 | |||
2562 | entries = names.items() |
|
2562 | entries = names.items() | |
2563 | entries.sort() |
|
2563 | entries.sort() | |
2564 |
|
2564 | |||
2565 | for abs, (rel, exact) in entries: |
|
2565 | for abs, (rel, exact) in entries: | |
2566 | mfentry = mf.get(abs) |
|
2566 | mfentry = mf.get(abs) | |
2567 | def handle(xlist, dobackup): |
|
2567 | def handle(xlist, dobackup): | |
2568 | xlist[0].append(abs) |
|
2568 | xlist[0].append(abs) | |
2569 | update[abs] = 1 |
|
2569 | update[abs] = 1 | |
2570 | if dobackup and not opts['no_backup'] and os.path.exists(rel): |
|
2570 | if dobackup and not opts['no_backup'] and os.path.exists(rel): | |
2571 | bakname = "%s.orig" % rel |
|
2571 | bakname = "%s.orig" % rel | |
2572 | ui.note(_('saving current version of %s as %s\n') % |
|
2572 | ui.note(_('saving current version of %s as %s\n') % | |
2573 | (rel, bakname)) |
|
2573 | (rel, bakname)) | |
2574 | if not opts.get('dry_run'): |
|
2574 | if not opts.get('dry_run'): | |
2575 | shutil.copyfile(rel, bakname) |
|
2575 | shutil.copyfile(rel, bakname) | |
2576 | shutil.copymode(rel, bakname) |
|
2576 | shutil.copymode(rel, bakname) | |
2577 | if ui.verbose or not exact: |
|
2577 | if ui.verbose or not exact: | |
2578 | ui.status(xlist[1] % rel) |
|
2578 | ui.status(xlist[1] % rel) | |
2579 | for table, hitlist, misslist, backuphit, backupmiss in disptable: |
|
2579 | for table, hitlist, misslist, backuphit, backupmiss in disptable: | |
2580 | if abs not in table: continue |
|
2580 | if abs not in table: continue | |
2581 | # file has changed in dirstate |
|
2581 | # file has changed in dirstate | |
2582 | if mfentry: |
|
2582 | if mfentry: | |
2583 | handle(hitlist, backuphit) |
|
2583 | handle(hitlist, backuphit) | |
2584 | elif misslist is not None: |
|
2584 | elif misslist is not None: | |
2585 | handle(misslist, backupmiss) |
|
2585 | handle(misslist, backupmiss) | |
2586 | else: |
|
2586 | else: | |
2587 | if exact: ui.warn(_('file not managed: %s\n' % rel)) |
|
2587 | if exact: ui.warn(_('file not managed: %s\n' % rel)) | |
2588 | break |
|
2588 | break | |
2589 | else: |
|
2589 | else: | |
2590 | # file has not changed in dirstate |
|
2590 | # file has not changed in dirstate | |
2591 | if node == parent: |
|
2591 | if node == parent: | |
2592 | if exact: ui.warn(_('no changes needed to %s\n' % rel)) |
|
2592 | if exact: ui.warn(_('no changes needed to %s\n' % rel)) | |
2593 | continue |
|
2593 | continue | |
2594 | if pmf is None: |
|
2594 | if pmf is None: | |
2595 | # only need parent manifest in this unlikely case, |
|
2595 | # only need parent manifest in this unlikely case, | |
2596 | # so do not read by default |
|
2596 | # so do not read by default | |
2597 | pmf = repo.manifest.read(repo.changelog.read(parent)[0]) |
|
2597 | pmf = repo.manifest.read(repo.changelog.read(parent)[0]) | |
2598 | if abs in pmf: |
|
2598 | if abs in pmf: | |
2599 | if mfentry: |
|
2599 | if mfentry: | |
2600 | # if version of file is same in parent and target |
|
2600 | # if version of file is same in parent and target | |
2601 | # manifests, do nothing |
|
2601 | # manifests, do nothing | |
2602 | if pmf[abs] != mfentry: |
|
2602 | if pmf[abs] != mfentry: | |
2603 | handle(revert, False) |
|
2603 | handle(revert, False) | |
2604 | else: |
|
2604 | else: | |
2605 | handle(remove, False) |
|
2605 | handle(remove, False) | |
2606 |
|
2606 | |||
2607 | if not opts.get('dry_run'): |
|
2607 | if not opts.get('dry_run'): | |
2608 | repo.dirstate.forget(forget[0]) |
|
2608 | repo.dirstate.forget(forget[0]) | |
2609 |
r = hg. |
|
2609 | r = hg.revert(repo, node, update.has_key) | |
2610 | wlock=wlock, show_stats=False) # revert |
|
|||
2611 | repo.dirstate.update(add[0], 'a') |
|
2610 | repo.dirstate.update(add[0], 'a') | |
2612 | repo.dirstate.update(undelete[0], 'n') |
|
2611 | repo.dirstate.update(undelete[0], 'n') | |
2613 | repo.dirstate.update(remove[0], 'r') |
|
2612 | repo.dirstate.update(remove[0], 'r') | |
2614 | return r |
|
2613 | return r | |
2615 |
|
2614 | |||
2616 | def rollback(ui, repo): |
|
2615 | def rollback(ui, repo): | |
2617 | """roll back the last transaction in this repository |
|
2616 | """roll back the last transaction in this repository | |
2618 |
|
2617 | |||
2619 | Roll back the last transaction in this repository, restoring the |
|
2618 | Roll back the last transaction in this repository, restoring the | |
2620 | project to its state prior to the transaction. |
|
2619 | project to its state prior to the transaction. | |
2621 |
|
2620 | |||
2622 | Transactions are used to encapsulate the effects of all commands |
|
2621 | Transactions are used to encapsulate the effects of all commands | |
2623 | that create new changesets or propagate existing changesets into a |
|
2622 | that create new changesets or propagate existing changesets into a | |
2624 | repository. For example, the following commands are transactional, |
|
2623 | repository. For example, the following commands are transactional, | |
2625 | and their effects can be rolled back: |
|
2624 | and their effects can be rolled back: | |
2626 |
|
2625 | |||
2627 | commit |
|
2626 | commit | |
2628 | import |
|
2627 | import | |
2629 | pull |
|
2628 | pull | |
2630 | push (with this repository as destination) |
|
2629 | push (with this repository as destination) | |
2631 | unbundle |
|
2630 | unbundle | |
2632 |
|
2631 | |||
2633 | This command should be used with care. There is only one level of |
|
2632 | This command should be used with care. There is only one level of | |
2634 | rollback, and there is no way to undo a rollback. |
|
2633 | rollback, and there is no way to undo a rollback. | |
2635 |
|
2634 | |||
2636 | This command is not intended for use on public repositories. Once |
|
2635 | This command is not intended for use on public repositories. Once | |
2637 | changes are visible for pull by other users, rolling a transaction |
|
2636 | changes are visible for pull by other users, rolling a transaction | |
2638 | back locally is ineffective (someone else may already have pulled |
|
2637 | back locally is ineffective (someone else may already have pulled | |
2639 | the changes). Furthermore, a race is possible with readers of the |
|
2638 | the changes). Furthermore, a race is possible with readers of the | |
2640 | repository; for example an in-progress pull from the repository |
|
2639 | repository; for example an in-progress pull from the repository | |
2641 | may fail if a rollback is performed. |
|
2640 | may fail if a rollback is performed. | |
2642 | """ |
|
2641 | """ | |
2643 | repo.rollback() |
|
2642 | repo.rollback() | |
2644 |
|
2643 | |||
2645 | def root(ui, repo): |
|
2644 | def root(ui, repo): | |
2646 | """print the root (top) of the current working dir |
|
2645 | """print the root (top) of the current working dir | |
2647 |
|
2646 | |||
2648 | Print the root directory of the current repository. |
|
2647 | Print the root directory of the current repository. | |
2649 | """ |
|
2648 | """ | |
2650 | ui.write(repo.root + "\n") |
|
2649 | ui.write(repo.root + "\n") | |
2651 |
|
2650 | |||
2652 | def serve(ui, repo, **opts): |
|
2651 | def serve(ui, repo, **opts): | |
2653 | """export the repository via HTTP |
|
2652 | """export the repository via HTTP | |
2654 |
|
2653 | |||
2655 | Start a local HTTP repository browser and pull server. |
|
2654 | Start a local HTTP repository browser and pull server. | |
2656 |
|
2655 | |||
2657 | By default, the server logs accesses to stdout and errors to |
|
2656 | By default, the server logs accesses to stdout and errors to | |
2658 | stderr. Use the "-A" and "-E" options to log to files. |
|
2657 | stderr. Use the "-A" and "-E" options to log to files. | |
2659 | """ |
|
2658 | """ | |
2660 |
|
2659 | |||
2661 | if opts["stdio"]: |
|
2660 | if opts["stdio"]: | |
2662 | if repo is None: |
|
2661 | if repo is None: | |
2663 | raise hg.RepoError(_('no repo found')) |
|
2662 | raise hg.RepoError(_('no repo found')) | |
2664 | s = sshserver.sshserver(ui, repo) |
|
2663 | s = sshserver.sshserver(ui, repo) | |
2665 | s.serve_forever() |
|
2664 | s.serve_forever() | |
2666 |
|
2665 | |||
2667 | optlist = ("name templates style address port ipv6" |
|
2666 | optlist = ("name templates style address port ipv6" | |
2668 | " accesslog errorlog webdir_conf") |
|
2667 | " accesslog errorlog webdir_conf") | |
2669 | for o in optlist.split(): |
|
2668 | for o in optlist.split(): | |
2670 | if opts[o]: |
|
2669 | if opts[o]: | |
2671 | ui.setconfig("web", o, opts[o]) |
|
2670 | ui.setconfig("web", o, opts[o]) | |
2672 |
|
2671 | |||
2673 | if repo is None and not ui.config("web", "webdir_conf"): |
|
2672 | if repo is None and not ui.config("web", "webdir_conf"): | |
2674 | raise hg.RepoError(_('no repo found')) |
|
2673 | raise hg.RepoError(_('no repo found')) | |
2675 |
|
2674 | |||
2676 | if opts['daemon'] and not opts['daemon_pipefds']: |
|
2675 | if opts['daemon'] and not opts['daemon_pipefds']: | |
2677 | rfd, wfd = os.pipe() |
|
2676 | rfd, wfd = os.pipe() | |
2678 | args = sys.argv[:] |
|
2677 | args = sys.argv[:] | |
2679 | args.append('--daemon-pipefds=%d,%d' % (rfd, wfd)) |
|
2678 | args.append('--daemon-pipefds=%d,%d' % (rfd, wfd)) | |
2680 | pid = os.spawnvp(os.P_NOWAIT | getattr(os, 'P_DETACH', 0), |
|
2679 | pid = os.spawnvp(os.P_NOWAIT | getattr(os, 'P_DETACH', 0), | |
2681 | args[0], args) |
|
2680 | args[0], args) | |
2682 | os.close(wfd) |
|
2681 | os.close(wfd) | |
2683 | os.read(rfd, 1) |
|
2682 | os.read(rfd, 1) | |
2684 | os._exit(0) |
|
2683 | os._exit(0) | |
2685 |
|
2684 | |||
2686 | try: |
|
2685 | try: | |
2687 | httpd = hgweb.server.create_server(ui, repo) |
|
2686 | httpd = hgweb.server.create_server(ui, repo) | |
2688 | except socket.error, inst: |
|
2687 | except socket.error, inst: | |
2689 | raise util.Abort(_('cannot start server: ') + inst.args[1]) |
|
2688 | raise util.Abort(_('cannot start server: ') + inst.args[1]) | |
2690 |
|
2689 | |||
2691 | if ui.verbose: |
|
2690 | if ui.verbose: | |
2692 | addr, port = httpd.socket.getsockname() |
|
2691 | addr, port = httpd.socket.getsockname() | |
2693 | if addr == '0.0.0.0': |
|
2692 | if addr == '0.0.0.0': | |
2694 | addr = socket.gethostname() |
|
2693 | addr = socket.gethostname() | |
2695 | else: |
|
2694 | else: | |
2696 | try: |
|
2695 | try: | |
2697 | addr = socket.gethostbyaddr(addr)[0] |
|
2696 | addr = socket.gethostbyaddr(addr)[0] | |
2698 | except socket.error: |
|
2697 | except socket.error: | |
2699 | pass |
|
2698 | pass | |
2700 | if port != 80: |
|
2699 | if port != 80: | |
2701 | ui.status(_('listening at http://%s:%d/\n') % (addr, port)) |
|
2700 | ui.status(_('listening at http://%s:%d/\n') % (addr, port)) | |
2702 | else: |
|
2701 | else: | |
2703 | ui.status(_('listening at http://%s/\n') % addr) |
|
2702 | ui.status(_('listening at http://%s/\n') % addr) | |
2704 |
|
2703 | |||
2705 | if opts['pid_file']: |
|
2704 | if opts['pid_file']: | |
2706 | fp = open(opts['pid_file'], 'w') |
|
2705 | fp = open(opts['pid_file'], 'w') | |
2707 | fp.write(str(os.getpid()) + '\n') |
|
2706 | fp.write(str(os.getpid()) + '\n') | |
2708 | fp.close() |
|
2707 | fp.close() | |
2709 |
|
2708 | |||
2710 | if opts['daemon_pipefds']: |
|
2709 | if opts['daemon_pipefds']: | |
2711 | rfd, wfd = [int(x) for x in opts['daemon_pipefds'].split(',')] |
|
2710 | rfd, wfd = [int(x) for x in opts['daemon_pipefds'].split(',')] | |
2712 | os.close(rfd) |
|
2711 | os.close(rfd) | |
2713 | os.write(wfd, 'y') |
|
2712 | os.write(wfd, 'y') | |
2714 | os.close(wfd) |
|
2713 | os.close(wfd) | |
2715 | sys.stdout.flush() |
|
2714 | sys.stdout.flush() | |
2716 | sys.stderr.flush() |
|
2715 | sys.stderr.flush() | |
2717 | fd = os.open(util.nulldev, os.O_RDWR) |
|
2716 | fd = os.open(util.nulldev, os.O_RDWR) | |
2718 | if fd != 0: os.dup2(fd, 0) |
|
2717 | if fd != 0: os.dup2(fd, 0) | |
2719 | if fd != 1: os.dup2(fd, 1) |
|
2718 | if fd != 1: os.dup2(fd, 1) | |
2720 | if fd != 2: os.dup2(fd, 2) |
|
2719 | if fd != 2: os.dup2(fd, 2) | |
2721 | if fd not in (0, 1, 2): os.close(fd) |
|
2720 | if fd not in (0, 1, 2): os.close(fd) | |
2722 |
|
2721 | |||
2723 | httpd.serve_forever() |
|
2722 | httpd.serve_forever() | |
2724 |
|
2723 | |||
2725 | def status(ui, repo, *pats, **opts): |
|
2724 | def status(ui, repo, *pats, **opts): | |
2726 | """show changed files in the working directory |
|
2725 | """show changed files in the working directory | |
2727 |
|
2726 | |||
2728 | Show status of files in the repository. If names are given, only |
|
2727 | Show status of files in the repository. If names are given, only | |
2729 | files that match are shown. Files that are clean or ignored, are |
|
2728 | files that match are shown. Files that are clean or ignored, are | |
2730 | not listed unless -c (clean), -i (ignored) or -A is given. |
|
2729 | not listed unless -c (clean), -i (ignored) or -A is given. | |
2731 |
|
2730 | |||
2732 | The codes used to show the status of files are: |
|
2731 | The codes used to show the status of files are: | |
2733 | M = modified |
|
2732 | M = modified | |
2734 | A = added |
|
2733 | A = added | |
2735 | R = removed |
|
2734 | R = removed | |
2736 | C = clean |
|
2735 | C = clean | |
2737 | ! = deleted, but still tracked |
|
2736 | ! = deleted, but still tracked | |
2738 | ? = not tracked |
|
2737 | ? = not tracked | |
2739 | I = ignored (not shown by default) |
|
2738 | I = ignored (not shown by default) | |
2740 | = the previous added file was copied from here |
|
2739 | = the previous added file was copied from here | |
2741 | """ |
|
2740 | """ | |
2742 |
|
2741 | |||
2743 | all = opts['all'] |
|
2742 | all = opts['all'] | |
2744 |
|
2743 | |||
2745 | files, matchfn, anypats = matchpats(repo, pats, opts) |
|
2744 | files, matchfn, anypats = matchpats(repo, pats, opts) | |
2746 | cwd = (pats and repo.getcwd()) or '' |
|
2745 | cwd = (pats and repo.getcwd()) or '' | |
2747 | modified, added, removed, deleted, unknown, ignored, clean = [ |
|
2746 | modified, added, removed, deleted, unknown, ignored, clean = [ | |
2748 | [util.pathto(cwd, x) for x in n] |
|
2747 | [util.pathto(cwd, x) for x in n] | |
2749 | for n in repo.status(files=files, match=matchfn, |
|
2748 | for n in repo.status(files=files, match=matchfn, | |
2750 | list_ignored=all or opts['ignored'], |
|
2749 | list_ignored=all or opts['ignored'], | |
2751 | list_clean=all or opts['clean'])] |
|
2750 | list_clean=all or opts['clean'])] | |
2752 |
|
2751 | |||
2753 | changetypes = (('modified', 'M', modified), |
|
2752 | changetypes = (('modified', 'M', modified), | |
2754 | ('added', 'A', added), |
|
2753 | ('added', 'A', added), | |
2755 | ('removed', 'R', removed), |
|
2754 | ('removed', 'R', removed), | |
2756 | ('deleted', '!', deleted), |
|
2755 | ('deleted', '!', deleted), | |
2757 | ('unknown', '?', unknown), |
|
2756 | ('unknown', '?', unknown), | |
2758 | ('ignored', 'I', ignored)) |
|
2757 | ('ignored', 'I', ignored)) | |
2759 |
|
2758 | |||
2760 | explicit_changetypes = changetypes + (('clean', 'C', clean),) |
|
2759 | explicit_changetypes = changetypes + (('clean', 'C', clean),) | |
2761 |
|
2760 | |||
2762 | end = opts['print0'] and '\0' or '\n' |
|
2761 | end = opts['print0'] and '\0' or '\n' | |
2763 |
|
2762 | |||
2764 | for opt, char, changes in ([ct for ct in explicit_changetypes |
|
2763 | for opt, char, changes in ([ct for ct in explicit_changetypes | |
2765 | if all or opts[ct[0]]] |
|
2764 | if all or opts[ct[0]]] | |
2766 | or changetypes): |
|
2765 | or changetypes): | |
2767 | if opts['no_status']: |
|
2766 | if opts['no_status']: | |
2768 | format = "%%s%s" % end |
|
2767 | format = "%%s%s" % end | |
2769 | else: |
|
2768 | else: | |
2770 | format = "%s %%s%s" % (char, end) |
|
2769 | format = "%s %%s%s" % (char, end) | |
2771 |
|
2770 | |||
2772 | for f in changes: |
|
2771 | for f in changes: | |
2773 | ui.write(format % f) |
|
2772 | ui.write(format % f) | |
2774 | if ((all or opts.get('copies')) and not opts.get('no_status') |
|
2773 | if ((all or opts.get('copies')) and not opts.get('no_status') | |
2775 | and opt == 'added' and repo.dirstate.copies.has_key(f)): |
|
2774 | and opt == 'added' and repo.dirstate.copies.has_key(f)): | |
2776 | ui.write(' %s%s' % (repo.dirstate.copies[f], end)) |
|
2775 | ui.write(' %s%s' % (repo.dirstate.copies[f], end)) | |
2777 |
|
2776 | |||
2778 | def tag(ui, repo, name, rev_=None, **opts): |
|
2777 | def tag(ui, repo, name, rev_=None, **opts): | |
2779 | """add a tag for the current tip or a given revision |
|
2778 | """add a tag for the current tip or a given revision | |
2780 |
|
2779 | |||
2781 | Name a particular revision using <name>. |
|
2780 | Name a particular revision using <name>. | |
2782 |
|
2781 | |||
2783 | Tags are used to name particular revisions of the repository and are |
|
2782 | Tags are used to name particular revisions of the repository and are | |
2784 | very useful to compare different revision, to go back to significant |
|
2783 | very useful to compare different revision, to go back to significant | |
2785 | earlier versions or to mark branch points as releases, etc. |
|
2784 | earlier versions or to mark branch points as releases, etc. | |
2786 |
|
2785 | |||
2787 | If no revision is given, the parent of the working directory is used. |
|
2786 | If no revision is given, the parent of the working directory is used. | |
2788 |
|
2787 | |||
2789 | To facilitate version control, distribution, and merging of tags, |
|
2788 | To facilitate version control, distribution, and merging of tags, | |
2790 | they are stored as a file named ".hgtags" which is managed |
|
2789 | they are stored as a file named ".hgtags" which is managed | |
2791 | similarly to other project files and can be hand-edited if |
|
2790 | similarly to other project files and can be hand-edited if | |
2792 | necessary. The file '.hg/localtags' is used for local tags (not |
|
2791 | necessary. The file '.hg/localtags' is used for local tags (not | |
2793 | shared among repositories). |
|
2792 | shared among repositories). | |
2794 | """ |
|
2793 | """ | |
2795 | if name in ['tip', '.']: |
|
2794 | if name in ['tip', '.']: | |
2796 | raise util.Abort(_("the name '%s' is reserved") % name) |
|
2795 | raise util.Abort(_("the name '%s' is reserved") % name) | |
2797 | if rev_ is not None: |
|
2796 | if rev_ is not None: | |
2798 | ui.warn(_("use of 'hg tag NAME [REV]' is deprecated, " |
|
2797 | ui.warn(_("use of 'hg tag NAME [REV]' is deprecated, " | |
2799 | "please use 'hg tag [-r REV] NAME' instead\n")) |
|
2798 | "please use 'hg tag [-r REV] NAME' instead\n")) | |
2800 | if opts['rev']: |
|
2799 | if opts['rev']: | |
2801 | raise util.Abort(_("use only one form to specify the revision")) |
|
2800 | raise util.Abort(_("use only one form to specify the revision")) | |
2802 | if opts['rev']: |
|
2801 | if opts['rev']: | |
2803 | rev_ = opts['rev'] |
|
2802 | rev_ = opts['rev'] | |
2804 | if rev_: |
|
2803 | if rev_: | |
2805 | r = hex(repo.lookup(rev_)) |
|
2804 | r = hex(repo.lookup(rev_)) | |
2806 | else: |
|
2805 | else: | |
2807 | p1, p2 = repo.dirstate.parents() |
|
2806 | p1, p2 = repo.dirstate.parents() | |
2808 | if p1 == nullid: |
|
2807 | if p1 == nullid: | |
2809 | raise util.Abort(_('no revision to tag')) |
|
2808 | raise util.Abort(_('no revision to tag')) | |
2810 | if p2 != nullid: |
|
2809 | if p2 != nullid: | |
2811 | raise util.Abort(_('outstanding uncommitted merges')) |
|
2810 | raise util.Abort(_('outstanding uncommitted merges')) | |
2812 | r = hex(p1) |
|
2811 | r = hex(p1) | |
2813 |
|
2812 | |||
2814 | repo.tag(name, r, opts['local'], opts['message'], opts['user'], |
|
2813 | repo.tag(name, r, opts['local'], opts['message'], opts['user'], | |
2815 | opts['date']) |
|
2814 | opts['date']) | |
2816 |
|
2815 | |||
2817 | def tags(ui, repo): |
|
2816 | def tags(ui, repo): | |
2818 | """list repository tags |
|
2817 | """list repository tags | |
2819 |
|
2818 | |||
2820 | List the repository tags. |
|
2819 | List the repository tags. | |
2821 |
|
2820 | |||
2822 | This lists both regular and local tags. |
|
2821 | This lists both regular and local tags. | |
2823 | """ |
|
2822 | """ | |
2824 |
|
2823 | |||
2825 | l = repo.tagslist() |
|
2824 | l = repo.tagslist() | |
2826 | l.reverse() |
|
2825 | l.reverse() | |
2827 | for t, n in l: |
|
2826 | for t, n in l: | |
2828 | try: |
|
2827 | try: | |
2829 | r = "%5d:%s" % (repo.changelog.rev(n), hex(n)) |
|
2828 | r = "%5d:%s" % (repo.changelog.rev(n), hex(n)) | |
2830 | except KeyError: |
|
2829 | except KeyError: | |
2831 | r = " ?:?" |
|
2830 | r = " ?:?" | |
2832 | if ui.quiet: |
|
2831 | if ui.quiet: | |
2833 | ui.write("%s\n" % t) |
|
2832 | ui.write("%s\n" % t) | |
2834 | else: |
|
2833 | else: | |
2835 | ui.write("%-30s %s\n" % (t, r)) |
|
2834 | ui.write("%-30s %s\n" % (t, r)) | |
2836 |
|
2835 | |||
2837 | def tip(ui, repo, **opts): |
|
2836 | def tip(ui, repo, **opts): | |
2838 | """show the tip revision |
|
2837 | """show the tip revision | |
2839 |
|
2838 | |||
2840 | Show the tip revision. |
|
2839 | Show the tip revision. | |
2841 | """ |
|
2840 | """ | |
2842 | n = repo.changelog.tip() |
|
2841 | n = repo.changelog.tip() | |
2843 | br = None |
|
2842 | br = None | |
2844 | if opts['branches']: |
|
2843 | if opts['branches']: | |
2845 | br = repo.branchlookup([n]) |
|
2844 | br = repo.branchlookup([n]) | |
2846 | show_changeset(ui, repo, opts).show(changenode=n, brinfo=br) |
|
2845 | show_changeset(ui, repo, opts).show(changenode=n, brinfo=br) | |
2847 | if opts['patch']: |
|
2846 | if opts['patch']: | |
2848 | dodiff(ui, ui, repo, repo.changelog.parents(n)[0], n) |
|
2847 | dodiff(ui, ui, repo, repo.changelog.parents(n)[0], n) | |
2849 |
|
2848 | |||
2850 | def unbundle(ui, repo, fname, **opts): |
|
2849 | def unbundle(ui, repo, fname, **opts): | |
2851 | """apply a changegroup file |
|
2850 | """apply a changegroup file | |
2852 |
|
2851 | |||
2853 | Apply a compressed changegroup file generated by the bundle |
|
2852 | Apply a compressed changegroup file generated by the bundle | |
2854 | command. |
|
2853 | command. | |
2855 | """ |
|
2854 | """ | |
2856 | f = urllib.urlopen(fname) |
|
2855 | f = urllib.urlopen(fname) | |
2857 |
|
2856 | |||
2858 | header = f.read(6) |
|
2857 | header = f.read(6) | |
2859 | if not header.startswith("HG"): |
|
2858 | if not header.startswith("HG"): | |
2860 | raise util.Abort(_("%s: not a Mercurial bundle file") % fname) |
|
2859 | raise util.Abort(_("%s: not a Mercurial bundle file") % fname) | |
2861 | elif not header.startswith("HG10"): |
|
2860 | elif not header.startswith("HG10"): | |
2862 | raise util.Abort(_("%s: unknown bundle version") % fname) |
|
2861 | raise util.Abort(_("%s: unknown bundle version") % fname) | |
2863 | elif header == "HG10BZ": |
|
2862 | elif header == "HG10BZ": | |
2864 | def generator(f): |
|
2863 | def generator(f): | |
2865 | zd = bz2.BZ2Decompressor() |
|
2864 | zd = bz2.BZ2Decompressor() | |
2866 | zd.decompress("BZ") |
|
2865 | zd.decompress("BZ") | |
2867 | for chunk in f: |
|
2866 | for chunk in f: | |
2868 | yield zd.decompress(chunk) |
|
2867 | yield zd.decompress(chunk) | |
2869 | elif header == "HG10UN": |
|
2868 | elif header == "HG10UN": | |
2870 | def generator(f): |
|
2869 | def generator(f): | |
2871 | for chunk in f: |
|
2870 | for chunk in f: | |
2872 | yield chunk |
|
2871 | yield chunk | |
2873 | else: |
|
2872 | else: | |
2874 | raise util.Abort(_("%s: unknown bundle compression type") |
|
2873 | raise util.Abort(_("%s: unknown bundle compression type") | |
2875 | % fname) |
|
2874 | % fname) | |
2876 | gen = generator(util.filechunkiter(f, 4096)) |
|
2875 | gen = generator(util.filechunkiter(f, 4096)) | |
2877 | modheads = repo.addchangegroup(util.chunkbuffer(gen), 'unbundle', |
|
2876 | modheads = repo.addchangegroup(util.chunkbuffer(gen), 'unbundle', | |
2878 | 'bundle:' + fname) |
|
2877 | 'bundle:' + fname) | |
2879 | return postincoming(ui, repo, modheads, opts['update']) |
|
2878 | return postincoming(ui, repo, modheads, opts['update']) | |
2880 |
|
2879 | |||
2881 | def undo(ui, repo): |
|
2880 | def undo(ui, repo): | |
2882 | """undo the last commit or pull (DEPRECATED) |
|
2881 | """undo the last commit or pull (DEPRECATED) | |
2883 |
|
2882 | |||
2884 | (DEPRECATED) |
|
2883 | (DEPRECATED) | |
2885 | This command is now deprecated and will be removed in a future |
|
2884 | This command is now deprecated and will be removed in a future | |
2886 | release. Please use the rollback command instead. For usage |
|
2885 | release. Please use the rollback command instead. For usage | |
2887 | instructions, see the rollback command. |
|
2886 | instructions, see the rollback command. | |
2888 | """ |
|
2887 | """ | |
2889 | ui.warn(_('(the undo command is deprecated; use rollback instead)\n')) |
|
2888 | ui.warn(_('(the undo command is deprecated; use rollback instead)\n')) | |
2890 | repo.rollback() |
|
2889 | repo.rollback() | |
2891 |
|
2890 | |||
2892 | def update(ui, repo, node=None, merge=False, clean=False, force=None, |
|
2891 | def update(ui, repo, node=None, merge=False, clean=False, force=None, | |
2893 | branch=None): |
|
2892 | branch=None): | |
2894 | """update or merge working directory |
|
2893 | """update or merge working directory | |
2895 |
|
2894 | |||
2896 | Update the working directory to the specified revision. |
|
2895 | Update the working directory to the specified revision. | |
2897 |
|
2896 | |||
2898 | If there are no outstanding changes in the working directory and |
|
2897 | If there are no outstanding changes in the working directory and | |
2899 | there is a linear relationship between the current version and the |
|
2898 | there is a linear relationship between the current version and the | |
2900 | requested version, the result is the requested version. |
|
2899 | requested version, the result is the requested version. | |
2901 |
|
2900 | |||
2902 | To merge the working directory with another revision, use the |
|
2901 | To merge the working directory with another revision, use the | |
2903 | merge command. |
|
2902 | merge command. | |
2904 |
|
2903 | |||
2905 | By default, update will refuse to run if doing so would require |
|
2904 | By default, update will refuse to run if doing so would require | |
2906 | merging or discarding local changes. |
|
2905 | merging or discarding local changes. | |
2907 | """ |
|
2906 | """ | |
|
2907 | node = _lookup(repo, node, branch) | |||
2908 | if merge: |
|
2908 | if merge: | |
2909 | ui.warn(_('(the -m/--merge option is deprecated; ' |
|
2909 | ui.warn(_('(the -m/--merge option is deprecated; ' | |
2910 | 'use the merge command instead)\n')) |
|
2910 | 'use the merge command instead)\n')) | |
2911 | node = _lookup(repo, node, branch) |
|
2911 | return hg.merge(repo, node, force=force) | |
2912 | return hg.update(repo, node, allow=merge, force=clean, forcemerge=force) |
|
2912 | elif clean: | |
|
2913 | return hg.clean(repo, node) | |||
|
2914 | else: | |||
|
2915 | return hg.update(repo, node) | |||
2913 |
|
2916 | |||
2914 | def _lookup(repo, node, branch=None): |
|
2917 | def _lookup(repo, node, branch=None): | |
2915 | if branch: |
|
2918 | if branch: | |
2916 | br = repo.branchlookup(branch=branch) |
|
2919 | br = repo.branchlookup(branch=branch) | |
2917 | found = [] |
|
2920 | found = [] | |
2918 | for x in br: |
|
2921 | for x in br: | |
2919 | if branch in br[x]: |
|
2922 | if branch in br[x]: | |
2920 | found.append(x) |
|
2923 | found.append(x) | |
2921 | if len(found) > 1: |
|
2924 | if len(found) > 1: | |
2922 | repo.ui.warn(_("Found multiple heads for %s\n") % branch) |
|
2925 | repo.ui.warn(_("Found multiple heads for %s\n") % branch) | |
2923 | for x in found: |
|
2926 | for x in found: | |
2924 | show_changeset(ui, repo, {}).show(changenode=x, brinfo=br) |
|
2927 | show_changeset(ui, repo, {}).show(changenode=x, brinfo=br) | |
2925 | raise util.Abort("") |
|
2928 | raise util.Abort("") | |
2926 | if len(found) == 1: |
|
2929 | if len(found) == 1: | |
2927 | node = found[0] |
|
2930 | node = found[0] | |
2928 | repo.ui.warn(_("Using head %s for branch %s\n") |
|
2931 | repo.ui.warn(_("Using head %s for branch %s\n") | |
2929 | % (short(node), branch)) |
|
2932 | % (short(node), branch)) | |
2930 | else: |
|
2933 | else: | |
2931 | raise util.Abort(_("branch %s not found\n") % (branch)) |
|
2934 | raise util.Abort(_("branch %s not found\n") % (branch)) | |
2932 | else: |
|
2935 | else: | |
2933 | node = node and repo.lookup(node) or repo.changelog.tip() |
|
2936 | node = node and repo.lookup(node) or repo.changelog.tip() | |
2934 | return node |
|
2937 | return node | |
2935 |
|
2938 | |||
2936 | def verify(ui, repo): |
|
2939 | def verify(ui, repo): | |
2937 | """verify the integrity of the repository |
|
2940 | """verify the integrity of the repository | |
2938 |
|
2941 | |||
2939 | Verify the integrity of the current repository. |
|
2942 | Verify the integrity of the current repository. | |
2940 |
|
2943 | |||
2941 | This will perform an extensive check of the repository's |
|
2944 | This will perform an extensive check of the repository's | |
2942 | integrity, validating the hashes and checksums of each entry in |
|
2945 | integrity, validating the hashes and checksums of each entry in | |
2943 | the changelog, manifest, and tracked files, as well as the |
|
2946 | the changelog, manifest, and tracked files, as well as the | |
2944 | integrity of their crosslinks and indices. |
|
2947 | integrity of their crosslinks and indices. | |
2945 | """ |
|
2948 | """ | |
2946 | return hg.verify(repo) |
|
2949 | return hg.verify(repo) | |
2947 |
|
2950 | |||
2948 | # Command options and aliases are listed here, alphabetically |
|
2951 | # Command options and aliases are listed here, alphabetically | |
2949 |
|
2952 | |||
2950 | table = { |
|
2953 | table = { | |
2951 | "^add": |
|
2954 | "^add": | |
2952 | (add, |
|
2955 | (add, | |
2953 | [('I', 'include', [], _('include names matching the given patterns')), |
|
2956 | [('I', 'include', [], _('include names matching the given patterns')), | |
2954 | ('X', 'exclude', [], _('exclude names matching the given patterns')), |
|
2957 | ('X', 'exclude', [], _('exclude names matching the given patterns')), | |
2955 | ('n', 'dry-run', None, _('do not perform actions, just print output'))], |
|
2958 | ('n', 'dry-run', None, _('do not perform actions, just print output'))], | |
2956 | _('hg add [OPTION]... [FILE]...')), |
|
2959 | _('hg add [OPTION]... [FILE]...')), | |
2957 | "debugaddremove|addremove": |
|
2960 | "debugaddremove|addremove": | |
2958 | (addremove, |
|
2961 | (addremove, | |
2959 | [('I', 'include', [], _('include names matching the given patterns')), |
|
2962 | [('I', 'include', [], _('include names matching the given patterns')), | |
2960 | ('X', 'exclude', [], _('exclude names matching the given patterns')), |
|
2963 | ('X', 'exclude', [], _('exclude names matching the given patterns')), | |
2961 | ('n', 'dry-run', None, _('do not perform actions, just print output'))], |
|
2964 | ('n', 'dry-run', None, _('do not perform actions, just print output'))], | |
2962 | _('hg addremove [OPTION]... [FILE]...')), |
|
2965 | _('hg addremove [OPTION]... [FILE]...')), | |
2963 | "^annotate": |
|
2966 | "^annotate": | |
2964 | (annotate, |
|
2967 | (annotate, | |
2965 | [('r', 'rev', '', _('annotate the specified revision')), |
|
2968 | [('r', 'rev', '', _('annotate the specified revision')), | |
2966 | ('a', 'text', None, _('treat all files as text')), |
|
2969 | ('a', 'text', None, _('treat all files as text')), | |
2967 | ('u', 'user', None, _('list the author')), |
|
2970 | ('u', 'user', None, _('list the author')), | |
2968 | ('d', 'date', None, _('list the date')), |
|
2971 | ('d', 'date', None, _('list the date')), | |
2969 | ('n', 'number', None, _('list the revision number (default)')), |
|
2972 | ('n', 'number', None, _('list the revision number (default)')), | |
2970 | ('c', 'changeset', None, _('list the changeset')), |
|
2973 | ('c', 'changeset', None, _('list the changeset')), | |
2971 | ('I', 'include', [], _('include names matching the given patterns')), |
|
2974 | ('I', 'include', [], _('include names matching the given patterns')), | |
2972 | ('X', 'exclude', [], _('exclude names matching the given patterns'))], |
|
2975 | ('X', 'exclude', [], _('exclude names matching the given patterns'))], | |
2973 | _('hg annotate [-r REV] [-a] [-u] [-d] [-n] [-c] FILE...')), |
|
2976 | _('hg annotate [-r REV] [-a] [-u] [-d] [-n] [-c] FILE...')), | |
2974 | "archive": |
|
2977 | "archive": | |
2975 | (archive, |
|
2978 | (archive, | |
2976 | [('', 'no-decode', None, _('do not pass files through decoders')), |
|
2979 | [('', 'no-decode', None, _('do not pass files through decoders')), | |
2977 | ('p', 'prefix', '', _('directory prefix for files in archive')), |
|
2980 | ('p', 'prefix', '', _('directory prefix for files in archive')), | |
2978 | ('r', 'rev', '', _('revision to distribute')), |
|
2981 | ('r', 'rev', '', _('revision to distribute')), | |
2979 | ('t', 'type', '', _('type of distribution to create')), |
|
2982 | ('t', 'type', '', _('type of distribution to create')), | |
2980 | ('I', 'include', [], _('include names matching the given patterns')), |
|
2983 | ('I', 'include', [], _('include names matching the given patterns')), | |
2981 | ('X', 'exclude', [], _('exclude names matching the given patterns'))], |
|
2984 | ('X', 'exclude', [], _('exclude names matching the given patterns'))], | |
2982 | _('hg archive [OPTION]... DEST')), |
|
2985 | _('hg archive [OPTION]... DEST')), | |
2983 | "backout": |
|
2986 | "backout": | |
2984 | (backout, |
|
2987 | (backout, | |
2985 | [('', 'merge', None, |
|
2988 | [('', 'merge', None, | |
2986 | _('merge with old dirstate parent after backout')), |
|
2989 | _('merge with old dirstate parent after backout')), | |
2987 | ('m', 'message', '', _('use <text> as commit message')), |
|
2990 | ('m', 'message', '', _('use <text> as commit message')), | |
2988 | ('l', 'logfile', '', _('read commit message from <file>')), |
|
2991 | ('l', 'logfile', '', _('read commit message from <file>')), | |
2989 | ('d', 'date', '', _('record datecode as commit date')), |
|
2992 | ('d', 'date', '', _('record datecode as commit date')), | |
2990 | ('', 'parent', '', _('parent to choose when backing out merge')), |
|
2993 | ('', 'parent', '', _('parent to choose when backing out merge')), | |
2991 | ('u', 'user', '', _('record user as committer')), |
|
2994 | ('u', 'user', '', _('record user as committer')), | |
2992 | ('I', 'include', [], _('include names matching the given patterns')), |
|
2995 | ('I', 'include', [], _('include names matching the given patterns')), | |
2993 | ('X', 'exclude', [], _('exclude names matching the given patterns'))], |
|
2996 | ('X', 'exclude', [], _('exclude names matching the given patterns'))], | |
2994 | _('hg backout [OPTION]... REV')), |
|
2997 | _('hg backout [OPTION]... REV')), | |
2995 | "bundle": |
|
2998 | "bundle": | |
2996 | (bundle, |
|
2999 | (bundle, | |
2997 | [('f', 'force', None, |
|
3000 | [('f', 'force', None, | |
2998 | _('run even when remote repository is unrelated'))], |
|
3001 | _('run even when remote repository is unrelated'))], | |
2999 | _('hg bundle FILE DEST')), |
|
3002 | _('hg bundle FILE DEST')), | |
3000 | "cat": |
|
3003 | "cat": | |
3001 | (cat, |
|
3004 | (cat, | |
3002 | [('o', 'output', '', _('print output to file with formatted name')), |
|
3005 | [('o', 'output', '', _('print output to file with formatted name')), | |
3003 | ('r', 'rev', '', _('print the given revision')), |
|
3006 | ('r', 'rev', '', _('print the given revision')), | |
3004 | ('I', 'include', [], _('include names matching the given patterns')), |
|
3007 | ('I', 'include', [], _('include names matching the given patterns')), | |
3005 | ('X', 'exclude', [], _('exclude names matching the given patterns'))], |
|
3008 | ('X', 'exclude', [], _('exclude names matching the given patterns'))], | |
3006 | _('hg cat [OPTION]... FILE...')), |
|
3009 | _('hg cat [OPTION]... FILE...')), | |
3007 | "^clone": |
|
3010 | "^clone": | |
3008 | (clone, |
|
3011 | (clone, | |
3009 | [('U', 'noupdate', None, _('do not update the new working directory')), |
|
3012 | [('U', 'noupdate', None, _('do not update the new working directory')), | |
3010 | ('r', 'rev', [], |
|
3013 | ('r', 'rev', [], | |
3011 | _('a changeset you would like to have after cloning')), |
|
3014 | _('a changeset you would like to have after cloning')), | |
3012 | ('', 'pull', None, _('use pull protocol to copy metadata')), |
|
3015 | ('', 'pull', None, _('use pull protocol to copy metadata')), | |
3013 | ('', 'uncompressed', None, |
|
3016 | ('', 'uncompressed', None, | |
3014 | _('use uncompressed transfer (fast over LAN)')), |
|
3017 | _('use uncompressed transfer (fast over LAN)')), | |
3015 | ('e', 'ssh', '', _('specify ssh command to use')), |
|
3018 | ('e', 'ssh', '', _('specify ssh command to use')), | |
3016 | ('', 'remotecmd', '', |
|
3019 | ('', 'remotecmd', '', | |
3017 | _('specify hg command to run on the remote side'))], |
|
3020 | _('specify hg command to run on the remote side'))], | |
3018 | _('hg clone [OPTION]... SOURCE [DEST]')), |
|
3021 | _('hg clone [OPTION]... SOURCE [DEST]')), | |
3019 | "^commit|ci": |
|
3022 | "^commit|ci": | |
3020 | (commit, |
|
3023 | (commit, | |
3021 | [('A', 'addremove', None, |
|
3024 | [('A', 'addremove', None, | |
3022 | _('mark new/missing files as added/removed before committing')), |
|
3025 | _('mark new/missing files as added/removed before committing')), | |
3023 | ('m', 'message', '', _('use <text> as commit message')), |
|
3026 | ('m', 'message', '', _('use <text> as commit message')), | |
3024 | ('l', 'logfile', '', _('read the commit message from <file>')), |
|
3027 | ('l', 'logfile', '', _('read the commit message from <file>')), | |
3025 | ('d', 'date', '', _('record datecode as commit date')), |
|
3028 | ('d', 'date', '', _('record datecode as commit date')), | |
3026 | ('u', 'user', '', _('record user as commiter')), |
|
3029 | ('u', 'user', '', _('record user as commiter')), | |
3027 | ('I', 'include', [], _('include names matching the given patterns')), |
|
3030 | ('I', 'include', [], _('include names matching the given patterns')), | |
3028 | ('X', 'exclude', [], _('exclude names matching the given patterns'))], |
|
3031 | ('X', 'exclude', [], _('exclude names matching the given patterns'))], | |
3029 | _('hg commit [OPTION]... [FILE]...')), |
|
3032 | _('hg commit [OPTION]... [FILE]...')), | |
3030 | "copy|cp": |
|
3033 | "copy|cp": | |
3031 | (copy, |
|
3034 | (copy, | |
3032 | [('A', 'after', None, _('record a copy that has already occurred')), |
|
3035 | [('A', 'after', None, _('record a copy that has already occurred')), | |
3033 | ('f', 'force', None, |
|
3036 | ('f', 'force', None, | |
3034 | _('forcibly copy over an existing managed file')), |
|
3037 | _('forcibly copy over an existing managed file')), | |
3035 | ('I', 'include', [], _('include names matching the given patterns')), |
|
3038 | ('I', 'include', [], _('include names matching the given patterns')), | |
3036 | ('X', 'exclude', [], _('exclude names matching the given patterns')), |
|
3039 | ('X', 'exclude', [], _('exclude names matching the given patterns')), | |
3037 | ('n', 'dry-run', None, _('do not perform actions, just print output'))], |
|
3040 | ('n', 'dry-run', None, _('do not perform actions, just print output'))], | |
3038 | _('hg copy [OPTION]... [SOURCE]... DEST')), |
|
3041 | _('hg copy [OPTION]... [SOURCE]... DEST')), | |
3039 | "debugancestor": (debugancestor, [], _('debugancestor INDEX REV1 REV2')), |
|
3042 | "debugancestor": (debugancestor, [], _('debugancestor INDEX REV1 REV2')), | |
3040 | "debugcomplete": |
|
3043 | "debugcomplete": | |
3041 | (debugcomplete, |
|
3044 | (debugcomplete, | |
3042 | [('o', 'options', None, _('show the command options'))], |
|
3045 | [('o', 'options', None, _('show the command options'))], | |
3043 | _('debugcomplete [-o] CMD')), |
|
3046 | _('debugcomplete [-o] CMD')), | |
3044 | "debugrebuildstate": |
|
3047 | "debugrebuildstate": | |
3045 | (debugrebuildstate, |
|
3048 | (debugrebuildstate, | |
3046 | [('r', 'rev', '', _('revision to rebuild to'))], |
|
3049 | [('r', 'rev', '', _('revision to rebuild to'))], | |
3047 | _('debugrebuildstate [-r REV] [REV]')), |
|
3050 | _('debugrebuildstate [-r REV] [REV]')), | |
3048 | "debugcheckstate": (debugcheckstate, [], _('debugcheckstate')), |
|
3051 | "debugcheckstate": (debugcheckstate, [], _('debugcheckstate')), | |
3049 | "debugconfig": (debugconfig, [], _('debugconfig [NAME]...')), |
|
3052 | "debugconfig": (debugconfig, [], _('debugconfig [NAME]...')), | |
3050 | "debugsetparents": (debugsetparents, [], _('debugsetparents REV1 [REV2]')), |
|
3053 | "debugsetparents": (debugsetparents, [], _('debugsetparents REV1 [REV2]')), | |
3051 | "debugstate": (debugstate, [], _('debugstate')), |
|
3054 | "debugstate": (debugstate, [], _('debugstate')), | |
3052 | "debugdata": (debugdata, [], _('debugdata FILE REV')), |
|
3055 | "debugdata": (debugdata, [], _('debugdata FILE REV')), | |
3053 | "debugindex": (debugindex, [], _('debugindex FILE')), |
|
3056 | "debugindex": (debugindex, [], _('debugindex FILE')), | |
3054 | "debugindexdot": (debugindexdot, [], _('debugindexdot FILE')), |
|
3057 | "debugindexdot": (debugindexdot, [], _('debugindexdot FILE')), | |
3055 | "debugrename": (debugrename, [], _('debugrename FILE [REV]')), |
|
3058 | "debugrename": (debugrename, [], _('debugrename FILE [REV]')), | |
3056 | "debugwalk": |
|
3059 | "debugwalk": | |
3057 | (debugwalk, |
|
3060 | (debugwalk, | |
3058 | [('I', 'include', [], _('include names matching the given patterns')), |
|
3061 | [('I', 'include', [], _('include names matching the given patterns')), | |
3059 | ('X', 'exclude', [], _('exclude names matching the given patterns'))], |
|
3062 | ('X', 'exclude', [], _('exclude names matching the given patterns'))], | |
3060 | _('debugwalk [OPTION]... [FILE]...')), |
|
3063 | _('debugwalk [OPTION]... [FILE]...')), | |
3061 | "^diff": |
|
3064 | "^diff": | |
3062 | (diff, |
|
3065 | (diff, | |
3063 | [('r', 'rev', [], _('revision')), |
|
3066 | [('r', 'rev', [], _('revision')), | |
3064 | ('a', 'text', None, _('treat all files as text')), |
|
3067 | ('a', 'text', None, _('treat all files as text')), | |
3065 | ('p', 'show-function', None, |
|
3068 | ('p', 'show-function', None, | |
3066 | _('show which function each change is in')), |
|
3069 | _('show which function each change is in')), | |
3067 | ('w', 'ignore-all-space', None, |
|
3070 | ('w', 'ignore-all-space', None, | |
3068 | _('ignore white space when comparing lines')), |
|
3071 | _('ignore white space when comparing lines')), | |
3069 | ('b', 'ignore-space-change', None, |
|
3072 | ('b', 'ignore-space-change', None, | |
3070 | _('ignore changes in the amount of white space')), |
|
3073 | _('ignore changes in the amount of white space')), | |
3071 | ('B', 'ignore-blank-lines', None, |
|
3074 | ('B', 'ignore-blank-lines', None, | |
3072 | _('ignore changes whose lines are all blank')), |
|
3075 | _('ignore changes whose lines are all blank')), | |
3073 | ('I', 'include', [], _('include names matching the given patterns')), |
|
3076 | ('I', 'include', [], _('include names matching the given patterns')), | |
3074 | ('X', 'exclude', [], _('exclude names matching the given patterns'))], |
|
3077 | ('X', 'exclude', [], _('exclude names matching the given patterns'))], | |
3075 | _('hg diff [-a] [-I] [-X] [-r REV1 [-r REV2]] [FILE]...')), |
|
3078 | _('hg diff [-a] [-I] [-X] [-r REV1 [-r REV2]] [FILE]...')), | |
3076 | "^export": |
|
3079 | "^export": | |
3077 | (export, |
|
3080 | (export, | |
3078 | [('o', 'output', '', _('print output to file with formatted name')), |
|
3081 | [('o', 'output', '', _('print output to file with formatted name')), | |
3079 | ('a', 'text', None, _('treat all files as text')), |
|
3082 | ('a', 'text', None, _('treat all files as text')), | |
3080 | ('', 'switch-parent', None, _('diff against the second parent'))], |
|
3083 | ('', 'switch-parent', None, _('diff against the second parent'))], | |
3081 | _('hg export [-a] [-o OUTFILESPEC] REV...')), |
|
3084 | _('hg export [-a] [-o OUTFILESPEC] REV...')), | |
3082 | "debugforget|forget": |
|
3085 | "debugforget|forget": | |
3083 | (forget, |
|
3086 | (forget, | |
3084 | [('I', 'include', [], _('include names matching the given patterns')), |
|
3087 | [('I', 'include', [], _('include names matching the given patterns')), | |
3085 | ('X', 'exclude', [], _('exclude names matching the given patterns'))], |
|
3088 | ('X', 'exclude', [], _('exclude names matching the given patterns'))], | |
3086 | _('hg forget [OPTION]... FILE...')), |
|
3089 | _('hg forget [OPTION]... FILE...')), | |
3087 | "grep": |
|
3090 | "grep": | |
3088 | (grep, |
|
3091 | (grep, | |
3089 | [('0', 'print0', None, _('end fields with NUL')), |
|
3092 | [('0', 'print0', None, _('end fields with NUL')), | |
3090 | ('', 'all', None, _('print all revisions that match')), |
|
3093 | ('', 'all', None, _('print all revisions that match')), | |
3091 | ('i', 'ignore-case', None, _('ignore case when matching')), |
|
3094 | ('i', 'ignore-case', None, _('ignore case when matching')), | |
3092 | ('l', 'files-with-matches', None, |
|
3095 | ('l', 'files-with-matches', None, | |
3093 | _('print only filenames and revs that match')), |
|
3096 | _('print only filenames and revs that match')), | |
3094 | ('n', 'line-number', None, _('print matching line numbers')), |
|
3097 | ('n', 'line-number', None, _('print matching line numbers')), | |
3095 | ('r', 'rev', [], _('search in given revision range')), |
|
3098 | ('r', 'rev', [], _('search in given revision range')), | |
3096 | ('u', 'user', None, _('print user who committed change')), |
|
3099 | ('u', 'user', None, _('print user who committed change')), | |
3097 | ('I', 'include', [], _('include names matching the given patterns')), |
|
3100 | ('I', 'include', [], _('include names matching the given patterns')), | |
3098 | ('X', 'exclude', [], _('exclude names matching the given patterns'))], |
|
3101 | ('X', 'exclude', [], _('exclude names matching the given patterns'))], | |
3099 | _('hg grep [OPTION]... PATTERN [FILE]...')), |
|
3102 | _('hg grep [OPTION]... PATTERN [FILE]...')), | |
3100 | "heads": |
|
3103 | "heads": | |
3101 | (heads, |
|
3104 | (heads, | |
3102 | [('b', 'branches', None, _('show branches')), |
|
3105 | [('b', 'branches', None, _('show branches')), | |
3103 | ('', 'style', '', _('display using template map file')), |
|
3106 | ('', 'style', '', _('display using template map file')), | |
3104 | ('r', 'rev', '', _('show only heads which are descendants of rev')), |
|
3107 | ('r', 'rev', '', _('show only heads which are descendants of rev')), | |
3105 | ('', 'template', '', _('display with template'))], |
|
3108 | ('', 'template', '', _('display with template'))], | |
3106 | _('hg heads [-b] [-r <rev>]')), |
|
3109 | _('hg heads [-b] [-r <rev>]')), | |
3107 | "help": (help_, [], _('hg help [COMMAND]')), |
|
3110 | "help": (help_, [], _('hg help [COMMAND]')), | |
3108 | "identify|id": (identify, [], _('hg identify')), |
|
3111 | "identify|id": (identify, [], _('hg identify')), | |
3109 | "import|patch": |
|
3112 | "import|patch": | |
3110 | (import_, |
|
3113 | (import_, | |
3111 | [('p', 'strip', 1, |
|
3114 | [('p', 'strip', 1, | |
3112 | _('directory strip option for patch. This has the same\n' |
|
3115 | _('directory strip option for patch. This has the same\n' | |
3113 | 'meaning as the corresponding patch option')), |
|
3116 | 'meaning as the corresponding patch option')), | |
3114 | ('m', 'message', '', _('use <text> as commit message')), |
|
3117 | ('m', 'message', '', _('use <text> as commit message')), | |
3115 | ('b', 'base', '', _('base path')), |
|
3118 | ('b', 'base', '', _('base path')), | |
3116 | ('f', 'force', None, |
|
3119 | ('f', 'force', None, | |
3117 | _('skip check for outstanding uncommitted changes'))], |
|
3120 | _('skip check for outstanding uncommitted changes'))], | |
3118 | _('hg import [-p NUM] [-b BASE] [-m MESSAGE] [-f] PATCH...')), |
|
3121 | _('hg import [-p NUM] [-b BASE] [-m MESSAGE] [-f] PATCH...')), | |
3119 | "incoming|in": (incoming, |
|
3122 | "incoming|in": (incoming, | |
3120 | [('M', 'no-merges', None, _('do not show merges')), |
|
3123 | [('M', 'no-merges', None, _('do not show merges')), | |
3121 | ('f', 'force', None, |
|
3124 | ('f', 'force', None, | |
3122 | _('run even when remote repository is unrelated')), |
|
3125 | _('run even when remote repository is unrelated')), | |
3123 | ('', 'style', '', _('display using template map file')), |
|
3126 | ('', 'style', '', _('display using template map file')), | |
3124 | ('n', 'newest-first', None, _('show newest record first')), |
|
3127 | ('n', 'newest-first', None, _('show newest record first')), | |
3125 | ('', 'bundle', '', _('file to store the bundles into')), |
|
3128 | ('', 'bundle', '', _('file to store the bundles into')), | |
3126 | ('p', 'patch', None, _('show patch')), |
|
3129 | ('p', 'patch', None, _('show patch')), | |
3127 | ('r', 'rev', [], _('a specific revision you would like to pull')), |
|
3130 | ('r', 'rev', [], _('a specific revision you would like to pull')), | |
3128 | ('', 'template', '', _('display with template')), |
|
3131 | ('', 'template', '', _('display with template')), | |
3129 | ('e', 'ssh', '', _('specify ssh command to use')), |
|
3132 | ('e', 'ssh', '', _('specify ssh command to use')), | |
3130 | ('', 'remotecmd', '', |
|
3133 | ('', 'remotecmd', '', | |
3131 | _('specify hg command to run on the remote side'))], |
|
3134 | _('specify hg command to run on the remote side'))], | |
3132 | _('hg incoming [-p] [-n] [-M] [-r REV]...' |
|
3135 | _('hg incoming [-p] [-n] [-M] [-r REV]...' | |
3133 | ' [--bundle FILENAME] [SOURCE]')), |
|
3136 | ' [--bundle FILENAME] [SOURCE]')), | |
3134 | "^init": |
|
3137 | "^init": | |
3135 | (init, |
|
3138 | (init, | |
3136 | [('e', 'ssh', '', _('specify ssh command to use')), |
|
3139 | [('e', 'ssh', '', _('specify ssh command to use')), | |
3137 | ('', 'remotecmd', '', |
|
3140 | ('', 'remotecmd', '', | |
3138 | _('specify hg command to run on the remote side'))], |
|
3141 | _('specify hg command to run on the remote side'))], | |
3139 | _('hg init [-e FILE] [--remotecmd FILE] [DEST]')), |
|
3142 | _('hg init [-e FILE] [--remotecmd FILE] [DEST]')), | |
3140 | "locate": |
|
3143 | "locate": | |
3141 | (locate, |
|
3144 | (locate, | |
3142 | [('r', 'rev', '', _('search the repository as it stood at rev')), |
|
3145 | [('r', 'rev', '', _('search the repository as it stood at rev')), | |
3143 | ('0', 'print0', None, |
|
3146 | ('0', 'print0', None, | |
3144 | _('end filenames with NUL, for use with xargs')), |
|
3147 | _('end filenames with NUL, for use with xargs')), | |
3145 | ('f', 'fullpath', None, |
|
3148 | ('f', 'fullpath', None, | |
3146 | _('print complete paths from the filesystem root')), |
|
3149 | _('print complete paths from the filesystem root')), | |
3147 | ('I', 'include', [], _('include names matching the given patterns')), |
|
3150 | ('I', 'include', [], _('include names matching the given patterns')), | |
3148 | ('X', 'exclude', [], _('exclude names matching the given patterns'))], |
|
3151 | ('X', 'exclude', [], _('exclude names matching the given patterns'))], | |
3149 | _('hg locate [OPTION]... [PATTERN]...')), |
|
3152 | _('hg locate [OPTION]... [PATTERN]...')), | |
3150 | "^log|history": |
|
3153 | "^log|history": | |
3151 | (log, |
|
3154 | (log, | |
3152 | [('b', 'branches', None, _('show branches')), |
|
3155 | [('b', 'branches', None, _('show branches')), | |
3153 | ('f', 'follow', None, |
|
3156 | ('f', 'follow', None, | |
3154 | _('follow changeset history, or file history across copies and renames')), |
|
3157 | _('follow changeset history, or file history across copies and renames')), | |
3155 | ('', 'follow-first', None, |
|
3158 | ('', 'follow-first', None, | |
3156 | _('only follow the first parent of merge changesets')), |
|
3159 | _('only follow the first parent of merge changesets')), | |
3157 | ('k', 'keyword', [], _('search for a keyword')), |
|
3160 | ('k', 'keyword', [], _('search for a keyword')), | |
3158 | ('l', 'limit', '', _('limit number of changes displayed')), |
|
3161 | ('l', 'limit', '', _('limit number of changes displayed')), | |
3159 | ('r', 'rev', [], _('show the specified revision or range')), |
|
3162 | ('r', 'rev', [], _('show the specified revision or range')), | |
3160 | ('M', 'no-merges', None, _('do not show merges')), |
|
3163 | ('M', 'no-merges', None, _('do not show merges')), | |
3161 | ('', 'style', '', _('display using template map file')), |
|
3164 | ('', 'style', '', _('display using template map file')), | |
3162 | ('m', 'only-merges', None, _('show only merges')), |
|
3165 | ('m', 'only-merges', None, _('show only merges')), | |
3163 | ('p', 'patch', None, _('show patch')), |
|
3166 | ('p', 'patch', None, _('show patch')), | |
3164 | ('', 'template', '', _('display with template')), |
|
3167 | ('', 'template', '', _('display with template')), | |
3165 | ('I', 'include', [], _('include names matching the given patterns')), |
|
3168 | ('I', 'include', [], _('include names matching the given patterns')), | |
3166 | ('X', 'exclude', [], _('exclude names matching the given patterns'))], |
|
3169 | ('X', 'exclude', [], _('exclude names matching the given patterns'))], | |
3167 | _('hg log [OPTION]... [FILE]')), |
|
3170 | _('hg log [OPTION]... [FILE]')), | |
3168 | "manifest": (manifest, [], _('hg manifest [REV]')), |
|
3171 | "manifest": (manifest, [], _('hg manifest [REV]')), | |
3169 | "merge": |
|
3172 | "merge": | |
3170 | (merge, |
|
3173 | (merge, | |
3171 | [('b', 'branch', '', _('merge with head of a specific branch')), |
|
3174 | [('b', 'branch', '', _('merge with head of a specific branch')), | |
3172 | ('f', 'force', None, _('force a merge with outstanding changes'))], |
|
3175 | ('f', 'force', None, _('force a merge with outstanding changes'))], | |
3173 | _('hg merge [-b TAG] [-f] [REV]')), |
|
3176 | _('hg merge [-b TAG] [-f] [REV]')), | |
3174 | "outgoing|out": (outgoing, |
|
3177 | "outgoing|out": (outgoing, | |
3175 | [('M', 'no-merges', None, _('do not show merges')), |
|
3178 | [('M', 'no-merges', None, _('do not show merges')), | |
3176 | ('f', 'force', None, |
|
3179 | ('f', 'force', None, | |
3177 | _('run even when remote repository is unrelated')), |
|
3180 | _('run even when remote repository is unrelated')), | |
3178 | ('p', 'patch', None, _('show patch')), |
|
3181 | ('p', 'patch', None, _('show patch')), | |
3179 | ('', 'style', '', _('display using template map file')), |
|
3182 | ('', 'style', '', _('display using template map file')), | |
3180 | ('r', 'rev', [], _('a specific revision you would like to push')), |
|
3183 | ('r', 'rev', [], _('a specific revision you would like to push')), | |
3181 | ('n', 'newest-first', None, _('show newest record first')), |
|
3184 | ('n', 'newest-first', None, _('show newest record first')), | |
3182 | ('', 'template', '', _('display with template')), |
|
3185 | ('', 'template', '', _('display with template')), | |
3183 | ('e', 'ssh', '', _('specify ssh command to use')), |
|
3186 | ('e', 'ssh', '', _('specify ssh command to use')), | |
3184 | ('', 'remotecmd', '', |
|
3187 | ('', 'remotecmd', '', | |
3185 | _('specify hg command to run on the remote side'))], |
|
3188 | _('specify hg command to run on the remote side'))], | |
3186 | _('hg outgoing [-M] [-p] [-n] [-r REV]... [DEST]')), |
|
3189 | _('hg outgoing [-M] [-p] [-n] [-r REV]... [DEST]')), | |
3187 | "^parents": |
|
3190 | "^parents": | |
3188 | (parents, |
|
3191 | (parents, | |
3189 | [('b', 'branches', None, _('show branches')), |
|
3192 | [('b', 'branches', None, _('show branches')), | |
3190 | ('r', 'rev', '', _('show parents from the specified rev')), |
|
3193 | ('r', 'rev', '', _('show parents from the specified rev')), | |
3191 | ('', 'style', '', _('display using template map file')), |
|
3194 | ('', 'style', '', _('display using template map file')), | |
3192 | ('', 'template', '', _('display with template'))], |
|
3195 | ('', 'template', '', _('display with template'))], | |
3193 | _('hg parents [-b] [-r REV] [FILE]')), |
|
3196 | _('hg parents [-b] [-r REV] [FILE]')), | |
3194 | "paths": (paths, [], _('hg paths [NAME]')), |
|
3197 | "paths": (paths, [], _('hg paths [NAME]')), | |
3195 | "^pull": |
|
3198 | "^pull": | |
3196 | (pull, |
|
3199 | (pull, | |
3197 | [('u', 'update', None, |
|
3200 | [('u', 'update', None, | |
3198 | _('update the working directory to tip after pull')), |
|
3201 | _('update the working directory to tip after pull')), | |
3199 | ('e', 'ssh', '', _('specify ssh command to use')), |
|
3202 | ('e', 'ssh', '', _('specify ssh command to use')), | |
3200 | ('f', 'force', None, |
|
3203 | ('f', 'force', None, | |
3201 | _('run even when remote repository is unrelated')), |
|
3204 | _('run even when remote repository is unrelated')), | |
3202 | ('r', 'rev', [], _('a specific revision you would like to pull')), |
|
3205 | ('r', 'rev', [], _('a specific revision you would like to pull')), | |
3203 | ('', 'remotecmd', '', |
|
3206 | ('', 'remotecmd', '', | |
3204 | _('specify hg command to run on the remote side'))], |
|
3207 | _('specify hg command to run on the remote side'))], | |
3205 | _('hg pull [-u] [-r REV]... [-e FILE] [--remotecmd FILE] [SOURCE]')), |
|
3208 | _('hg pull [-u] [-r REV]... [-e FILE] [--remotecmd FILE] [SOURCE]')), | |
3206 | "^push": |
|
3209 | "^push": | |
3207 | (push, |
|
3210 | (push, | |
3208 | [('f', 'force', None, _('force push')), |
|
3211 | [('f', 'force', None, _('force push')), | |
3209 | ('e', 'ssh', '', _('specify ssh command to use')), |
|
3212 | ('e', 'ssh', '', _('specify ssh command to use')), | |
3210 | ('r', 'rev', [], _('a specific revision you would like to push')), |
|
3213 | ('r', 'rev', [], _('a specific revision you would like to push')), | |
3211 | ('', 'remotecmd', '', |
|
3214 | ('', 'remotecmd', '', | |
3212 | _('specify hg command to run on the remote side'))], |
|
3215 | _('specify hg command to run on the remote side'))], | |
3213 | _('hg push [-f] [-r REV]... [-e FILE] [--remotecmd FILE] [DEST]')), |
|
3216 | _('hg push [-f] [-r REV]... [-e FILE] [--remotecmd FILE] [DEST]')), | |
3214 | "debugrawcommit|rawcommit": |
|
3217 | "debugrawcommit|rawcommit": | |
3215 | (rawcommit, |
|
3218 | (rawcommit, | |
3216 | [('p', 'parent', [], _('parent')), |
|
3219 | [('p', 'parent', [], _('parent')), | |
3217 | ('d', 'date', '', _('date code')), |
|
3220 | ('d', 'date', '', _('date code')), | |
3218 | ('u', 'user', '', _('user')), |
|
3221 | ('u', 'user', '', _('user')), | |
3219 | ('F', 'files', '', _('file list')), |
|
3222 | ('F', 'files', '', _('file list')), | |
3220 | ('m', 'message', '', _('commit message')), |
|
3223 | ('m', 'message', '', _('commit message')), | |
3221 | ('l', 'logfile', '', _('commit message file'))], |
|
3224 | ('l', 'logfile', '', _('commit message file'))], | |
3222 | _('hg debugrawcommit [OPTION]... [FILE]...')), |
|
3225 | _('hg debugrawcommit [OPTION]... [FILE]...')), | |
3223 | "recover": (recover, [], _('hg recover')), |
|
3226 | "recover": (recover, [], _('hg recover')), | |
3224 | "^remove|rm": |
|
3227 | "^remove|rm": | |
3225 | (remove, |
|
3228 | (remove, | |
3226 | [('A', 'after', None, _('record remove that has already occurred')), |
|
3229 | [('A', 'after', None, _('record remove that has already occurred')), | |
3227 | ('f', 'force', None, _('remove file even if modified')), |
|
3230 | ('f', 'force', None, _('remove file even if modified')), | |
3228 | ('I', 'include', [], _('include names matching the given patterns')), |
|
3231 | ('I', 'include', [], _('include names matching the given patterns')), | |
3229 | ('X', 'exclude', [], _('exclude names matching the given patterns'))], |
|
3232 | ('X', 'exclude', [], _('exclude names matching the given patterns'))], | |
3230 | _('hg remove [OPTION]... FILE...')), |
|
3233 | _('hg remove [OPTION]... FILE...')), | |
3231 | "rename|mv": |
|
3234 | "rename|mv": | |
3232 | (rename, |
|
3235 | (rename, | |
3233 | [('A', 'after', None, _('record a rename that has already occurred')), |
|
3236 | [('A', 'after', None, _('record a rename that has already occurred')), | |
3234 | ('f', 'force', None, |
|
3237 | ('f', 'force', None, | |
3235 | _('forcibly copy over an existing managed file')), |
|
3238 | _('forcibly copy over an existing managed file')), | |
3236 | ('I', 'include', [], _('include names matching the given patterns')), |
|
3239 | ('I', 'include', [], _('include names matching the given patterns')), | |
3237 | ('X', 'exclude', [], _('exclude names matching the given patterns')), |
|
3240 | ('X', 'exclude', [], _('exclude names matching the given patterns')), | |
3238 | ('n', 'dry-run', None, _('do not perform actions, just print output'))], |
|
3241 | ('n', 'dry-run', None, _('do not perform actions, just print output'))], | |
3239 | _('hg rename [OPTION]... SOURCE... DEST')), |
|
3242 | _('hg rename [OPTION]... SOURCE... DEST')), | |
3240 | "^revert": |
|
3243 | "^revert": | |
3241 | (revert, |
|
3244 | (revert, | |
3242 | [('r', 'rev', '', _('revision to revert to')), |
|
3245 | [('r', 'rev', '', _('revision to revert to')), | |
3243 | ('', 'no-backup', None, _('do not save backup copies of files')), |
|
3246 | ('', 'no-backup', None, _('do not save backup copies of files')), | |
3244 | ('I', 'include', [], _('include names matching given patterns')), |
|
3247 | ('I', 'include', [], _('include names matching given patterns')), | |
3245 | ('X', 'exclude', [], _('exclude names matching given patterns')), |
|
3248 | ('X', 'exclude', [], _('exclude names matching given patterns')), | |
3246 | ('n', 'dry-run', None, _('do not perform actions, just print output'))], |
|
3249 | ('n', 'dry-run', None, _('do not perform actions, just print output'))], | |
3247 | _('hg revert [-r REV] [NAME]...')), |
|
3250 | _('hg revert [-r REV] [NAME]...')), | |
3248 | "rollback": (rollback, [], _('hg rollback')), |
|
3251 | "rollback": (rollback, [], _('hg rollback')), | |
3249 | "root": (root, [], _('hg root')), |
|
3252 | "root": (root, [], _('hg root')), | |
3250 | "^serve": |
|
3253 | "^serve": | |
3251 | (serve, |
|
3254 | (serve, | |
3252 | [('A', 'accesslog', '', _('name of access log file to write to')), |
|
3255 | [('A', 'accesslog', '', _('name of access log file to write to')), | |
3253 | ('d', 'daemon', None, _('run server in background')), |
|
3256 | ('d', 'daemon', None, _('run server in background')), | |
3254 | ('', 'daemon-pipefds', '', _('used internally by daemon mode')), |
|
3257 | ('', 'daemon-pipefds', '', _('used internally by daemon mode')), | |
3255 | ('E', 'errorlog', '', _('name of error log file to write to')), |
|
3258 | ('E', 'errorlog', '', _('name of error log file to write to')), | |
3256 | ('p', 'port', 0, _('port to use (default: 8000)')), |
|
3259 | ('p', 'port', 0, _('port to use (default: 8000)')), | |
3257 | ('a', 'address', '', _('address to use')), |
|
3260 | ('a', 'address', '', _('address to use')), | |
3258 | ('n', 'name', '', |
|
3261 | ('n', 'name', '', | |
3259 | _('name to show in web pages (default: working dir)')), |
|
3262 | _('name to show in web pages (default: working dir)')), | |
3260 | ('', 'webdir-conf', '', _('name of the webdir config file' |
|
3263 | ('', 'webdir-conf', '', _('name of the webdir config file' | |
3261 | ' (serve more than one repo)')), |
|
3264 | ' (serve more than one repo)')), | |
3262 | ('', 'pid-file', '', _('name of file to write process ID to')), |
|
3265 | ('', 'pid-file', '', _('name of file to write process ID to')), | |
3263 | ('', 'stdio', None, _('for remote clients')), |
|
3266 | ('', 'stdio', None, _('for remote clients')), | |
3264 | ('t', 'templates', '', _('web templates to use')), |
|
3267 | ('t', 'templates', '', _('web templates to use')), | |
3265 | ('', 'style', '', _('template style to use')), |
|
3268 | ('', 'style', '', _('template style to use')), | |
3266 | ('6', 'ipv6', None, _('use IPv6 in addition to IPv4'))], |
|
3269 | ('6', 'ipv6', None, _('use IPv6 in addition to IPv4'))], | |
3267 | _('hg serve [OPTION]...')), |
|
3270 | _('hg serve [OPTION]...')), | |
3268 | "^status|st": |
|
3271 | "^status|st": | |
3269 | (status, |
|
3272 | (status, | |
3270 | [('A', 'all', None, _('show status of all files')), |
|
3273 | [('A', 'all', None, _('show status of all files')), | |
3271 | ('m', 'modified', None, _('show only modified files')), |
|
3274 | ('m', 'modified', None, _('show only modified files')), | |
3272 | ('a', 'added', None, _('show only added files')), |
|
3275 | ('a', 'added', None, _('show only added files')), | |
3273 | ('r', 'removed', None, _('show only removed files')), |
|
3276 | ('r', 'removed', None, _('show only removed files')), | |
3274 | ('d', 'deleted', None, _('show only deleted (but tracked) files')), |
|
3277 | ('d', 'deleted', None, _('show only deleted (but tracked) files')), | |
3275 | ('c', 'clean', None, _('show only files without changes')), |
|
3278 | ('c', 'clean', None, _('show only files without changes')), | |
3276 | ('u', 'unknown', None, _('show only unknown (not tracked) files')), |
|
3279 | ('u', 'unknown', None, _('show only unknown (not tracked) files')), | |
3277 | ('i', 'ignored', None, _('show ignored files')), |
|
3280 | ('i', 'ignored', None, _('show ignored files')), | |
3278 | ('n', 'no-status', None, _('hide status prefix')), |
|
3281 | ('n', 'no-status', None, _('hide status prefix')), | |
3279 | ('C', 'copies', None, _('show source of copied files')), |
|
3282 | ('C', 'copies', None, _('show source of copied files')), | |
3280 | ('0', 'print0', None, |
|
3283 | ('0', 'print0', None, | |
3281 | _('end filenames with NUL, for use with xargs')), |
|
3284 | _('end filenames with NUL, for use with xargs')), | |
3282 | ('I', 'include', [], _('include names matching the given patterns')), |
|
3285 | ('I', 'include', [], _('include names matching the given patterns')), | |
3283 | ('X', 'exclude', [], _('exclude names matching the given patterns'))], |
|
3286 | ('X', 'exclude', [], _('exclude names matching the given patterns'))], | |
3284 | _('hg status [OPTION]... [FILE]...')), |
|
3287 | _('hg status [OPTION]... [FILE]...')), | |
3285 | "tag": |
|
3288 | "tag": | |
3286 | (tag, |
|
3289 | (tag, | |
3287 | [('l', 'local', None, _('make the tag local')), |
|
3290 | [('l', 'local', None, _('make the tag local')), | |
3288 | ('m', 'message', '', _('message for tag commit log entry')), |
|
3291 | ('m', 'message', '', _('message for tag commit log entry')), | |
3289 | ('d', 'date', '', _('record datecode as commit date')), |
|
3292 | ('d', 'date', '', _('record datecode as commit date')), | |
3290 | ('u', 'user', '', _('record user as commiter')), |
|
3293 | ('u', 'user', '', _('record user as commiter')), | |
3291 | ('r', 'rev', '', _('revision to tag'))], |
|
3294 | ('r', 'rev', '', _('revision to tag'))], | |
3292 | _('hg tag [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME')), |
|
3295 | _('hg tag [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME')), | |
3293 | "tags": (tags, [], _('hg tags')), |
|
3296 | "tags": (tags, [], _('hg tags')), | |
3294 | "tip": |
|
3297 | "tip": | |
3295 | (tip, |
|
3298 | (tip, | |
3296 | [('b', 'branches', None, _('show branches')), |
|
3299 | [('b', 'branches', None, _('show branches')), | |
3297 | ('', 'style', '', _('display using template map file')), |
|
3300 | ('', 'style', '', _('display using template map file')), | |
3298 | ('p', 'patch', None, _('show patch')), |
|
3301 | ('p', 'patch', None, _('show patch')), | |
3299 | ('', 'template', '', _('display with template'))], |
|
3302 | ('', 'template', '', _('display with template'))], | |
3300 | _('hg tip [-b] [-p]')), |
|
3303 | _('hg tip [-b] [-p]')), | |
3301 | "unbundle": |
|
3304 | "unbundle": | |
3302 | (unbundle, |
|
3305 | (unbundle, | |
3303 | [('u', 'update', None, |
|
3306 | [('u', 'update', None, | |
3304 | _('update the working directory to tip after unbundle'))], |
|
3307 | _('update the working directory to tip after unbundle'))], | |
3305 | _('hg unbundle [-u] FILE')), |
|
3308 | _('hg unbundle [-u] FILE')), | |
3306 | "debugundo|undo": (undo, [], _('hg undo')), |
|
3309 | "debugundo|undo": (undo, [], _('hg undo')), | |
3307 | "^update|up|checkout|co": |
|
3310 | "^update|up|checkout|co": | |
3308 | (update, |
|
3311 | (update, | |
3309 | [('b', 'branch', '', _('checkout the head of a specific branch')), |
|
3312 | [('b', 'branch', '', _('checkout the head of a specific branch')), | |
3310 | ('m', 'merge', None, _('allow merging of branches (DEPRECATED)')), |
|
3313 | ('m', 'merge', None, _('allow merging of branches (DEPRECATED)')), | |
3311 | ('C', 'clean', None, _('overwrite locally modified files')), |
|
3314 | ('C', 'clean', None, _('overwrite locally modified files')), | |
3312 | ('f', 'force', None, _('force a merge with outstanding changes'))], |
|
3315 | ('f', 'force', None, _('force a merge with outstanding changes'))], | |
3313 | _('hg update [-b TAG] [-m] [-C] [-f] [REV]')), |
|
3316 | _('hg update [-b TAG] [-m] [-C] [-f] [REV]')), | |
3314 | "verify": (verify, [], _('hg verify')), |
|
3317 | "verify": (verify, [], _('hg verify')), | |
3315 | "version": (show_version, [], _('hg version')), |
|
3318 | "version": (show_version, [], _('hg version')), | |
3316 | } |
|
3319 | } | |
3317 |
|
3320 | |||
3318 | globalopts = [ |
|
3321 | globalopts = [ | |
3319 | ('R', 'repository', '', |
|
3322 | ('R', 'repository', '', | |
3320 | _('repository root directory or symbolic path name')), |
|
3323 | _('repository root directory or symbolic path name')), | |
3321 | ('', 'cwd', '', _('change working directory')), |
|
3324 | ('', 'cwd', '', _('change working directory')), | |
3322 | ('y', 'noninteractive', None, |
|
3325 | ('y', 'noninteractive', None, | |
3323 | _('do not prompt, assume \'yes\' for any required answers')), |
|
3326 | _('do not prompt, assume \'yes\' for any required answers')), | |
3324 | ('q', 'quiet', None, _('suppress output')), |
|
3327 | ('q', 'quiet', None, _('suppress output')), | |
3325 | ('v', 'verbose', None, _('enable additional output')), |
|
3328 | ('v', 'verbose', None, _('enable additional output')), | |
3326 | ('', 'config', [], _('set/override config option')), |
|
3329 | ('', 'config', [], _('set/override config option')), | |
3327 | ('', 'debug', None, _('enable debugging output')), |
|
3330 | ('', 'debug', None, _('enable debugging output')), | |
3328 | ('', 'debugger', None, _('start debugger')), |
|
3331 | ('', 'debugger', None, _('start debugger')), | |
3329 | ('', 'lsprof', None, _('print improved command execution profile')), |
|
3332 | ('', 'lsprof', None, _('print improved command execution profile')), | |
3330 | ('', 'traceback', None, _('print traceback on exception')), |
|
3333 | ('', 'traceback', None, _('print traceback on exception')), | |
3331 | ('', 'time', None, _('time how long the command takes')), |
|
3334 | ('', 'time', None, _('time how long the command takes')), | |
3332 | ('', 'profile', None, _('print command execution profile')), |
|
3335 | ('', 'profile', None, _('print command execution profile')), | |
3333 | ('', 'version', None, _('output version information and exit')), |
|
3336 | ('', 'version', None, _('output version information and exit')), | |
3334 | ('h', 'help', None, _('display help and exit')), |
|
3337 | ('h', 'help', None, _('display help and exit')), | |
3335 | ] |
|
3338 | ] | |
3336 |
|
3339 | |||
3337 | norepo = ("clone init version help debugancestor debugcomplete debugdata" |
|
3340 | norepo = ("clone init version help debugancestor debugcomplete debugdata" | |
3338 | " debugindex debugindexdot") |
|
3341 | " debugindex debugindexdot") | |
3339 | optionalrepo = ("paths serve debugconfig") |
|
3342 | optionalrepo = ("paths serve debugconfig") | |
3340 |
|
3343 | |||
3341 | def findpossible(cmd): |
|
3344 | def findpossible(cmd): | |
3342 | """ |
|
3345 | """ | |
3343 | Return cmd -> (aliases, command table entry) |
|
3346 | Return cmd -> (aliases, command table entry) | |
3344 | for each matching command. |
|
3347 | for each matching command. | |
3345 | Return debug commands (or their aliases) only if no normal command matches. |
|
3348 | Return debug commands (or their aliases) only if no normal command matches. | |
3346 | """ |
|
3349 | """ | |
3347 | choice = {} |
|
3350 | choice = {} | |
3348 | debugchoice = {} |
|
3351 | debugchoice = {} | |
3349 | for e in table.keys(): |
|
3352 | for e in table.keys(): | |
3350 | aliases = e.lstrip("^").split("|") |
|
3353 | aliases = e.lstrip("^").split("|") | |
3351 | found = None |
|
3354 | found = None | |
3352 | if cmd in aliases: |
|
3355 | if cmd in aliases: | |
3353 | found = cmd |
|
3356 | found = cmd | |
3354 | else: |
|
3357 | else: | |
3355 | for a in aliases: |
|
3358 | for a in aliases: | |
3356 | if a.startswith(cmd): |
|
3359 | if a.startswith(cmd): | |
3357 | found = a |
|
3360 | found = a | |
3358 | break |
|
3361 | break | |
3359 | if found is not None: |
|
3362 | if found is not None: | |
3360 | if aliases[0].startswith("debug"): |
|
3363 | if aliases[0].startswith("debug"): | |
3361 | debugchoice[found] = (aliases, table[e]) |
|
3364 | debugchoice[found] = (aliases, table[e]) | |
3362 | else: |
|
3365 | else: | |
3363 | choice[found] = (aliases, table[e]) |
|
3366 | choice[found] = (aliases, table[e]) | |
3364 |
|
3367 | |||
3365 | if not choice and debugchoice: |
|
3368 | if not choice and debugchoice: | |
3366 | choice = debugchoice |
|
3369 | choice = debugchoice | |
3367 |
|
3370 | |||
3368 | return choice |
|
3371 | return choice | |
3369 |
|
3372 | |||
3370 | def findcmd(cmd): |
|
3373 | def findcmd(cmd): | |
3371 | """Return (aliases, command table entry) for command string.""" |
|
3374 | """Return (aliases, command table entry) for command string.""" | |
3372 | choice = findpossible(cmd) |
|
3375 | choice = findpossible(cmd) | |
3373 |
|
3376 | |||
3374 | if choice.has_key(cmd): |
|
3377 | if choice.has_key(cmd): | |
3375 | return choice[cmd] |
|
3378 | return choice[cmd] | |
3376 |
|
3379 | |||
3377 | if len(choice) > 1: |
|
3380 | if len(choice) > 1: | |
3378 | clist = choice.keys() |
|
3381 | clist = choice.keys() | |
3379 | clist.sort() |
|
3382 | clist.sort() | |
3380 | raise AmbiguousCommand(cmd, clist) |
|
3383 | raise AmbiguousCommand(cmd, clist) | |
3381 |
|
3384 | |||
3382 | if choice: |
|
3385 | if choice: | |
3383 | return choice.values()[0] |
|
3386 | return choice.values()[0] | |
3384 |
|
3387 | |||
3385 | raise UnknownCommand(cmd) |
|
3388 | raise UnknownCommand(cmd) | |
3386 |
|
3389 | |||
3387 | def catchterm(*args): |
|
3390 | def catchterm(*args): | |
3388 | raise util.SignalInterrupt |
|
3391 | raise util.SignalInterrupt | |
3389 |
|
3392 | |||
3390 | def run(): |
|
3393 | def run(): | |
3391 | sys.exit(dispatch(sys.argv[1:])) |
|
3394 | sys.exit(dispatch(sys.argv[1:])) | |
3392 |
|
3395 | |||
3393 | class ParseError(Exception): |
|
3396 | class ParseError(Exception): | |
3394 | """Exception raised on errors in parsing the command line.""" |
|
3397 | """Exception raised on errors in parsing the command line.""" | |
3395 |
|
3398 | |||
3396 | def parse(ui, args): |
|
3399 | def parse(ui, args): | |
3397 | options = {} |
|
3400 | options = {} | |
3398 | cmdoptions = {} |
|
3401 | cmdoptions = {} | |
3399 |
|
3402 | |||
3400 | try: |
|
3403 | try: | |
3401 | args = fancyopts.fancyopts(args, globalopts, options) |
|
3404 | args = fancyopts.fancyopts(args, globalopts, options) | |
3402 | except fancyopts.getopt.GetoptError, inst: |
|
3405 | except fancyopts.getopt.GetoptError, inst: | |
3403 | raise ParseError(None, inst) |
|
3406 | raise ParseError(None, inst) | |
3404 |
|
3407 | |||
3405 | if args: |
|
3408 | if args: | |
3406 | cmd, args = args[0], args[1:] |
|
3409 | cmd, args = args[0], args[1:] | |
3407 | aliases, i = findcmd(cmd) |
|
3410 | aliases, i = findcmd(cmd) | |
3408 | cmd = aliases[0] |
|
3411 | cmd = aliases[0] | |
3409 | defaults = ui.config("defaults", cmd) |
|
3412 | defaults = ui.config("defaults", cmd) | |
3410 | if defaults: |
|
3413 | if defaults: | |
3411 | args = defaults.split() + args |
|
3414 | args = defaults.split() + args | |
3412 | c = list(i[1]) |
|
3415 | c = list(i[1]) | |
3413 | else: |
|
3416 | else: | |
3414 | cmd = None |
|
3417 | cmd = None | |
3415 | c = [] |
|
3418 | c = [] | |
3416 |
|
3419 | |||
3417 | # combine global options into local |
|
3420 | # combine global options into local | |
3418 | for o in globalopts: |
|
3421 | for o in globalopts: | |
3419 | c.append((o[0], o[1], options[o[1]], o[3])) |
|
3422 | c.append((o[0], o[1], options[o[1]], o[3])) | |
3420 |
|
3423 | |||
3421 | try: |
|
3424 | try: | |
3422 | args = fancyopts.fancyopts(args, c, cmdoptions) |
|
3425 | args = fancyopts.fancyopts(args, c, cmdoptions) | |
3423 | except fancyopts.getopt.GetoptError, inst: |
|
3426 | except fancyopts.getopt.GetoptError, inst: | |
3424 | raise ParseError(cmd, inst) |
|
3427 | raise ParseError(cmd, inst) | |
3425 |
|
3428 | |||
3426 | # separate global options back out |
|
3429 | # separate global options back out | |
3427 | for o in globalopts: |
|
3430 | for o in globalopts: | |
3428 | n = o[1] |
|
3431 | n = o[1] | |
3429 | options[n] = cmdoptions[n] |
|
3432 | options[n] = cmdoptions[n] | |
3430 | del cmdoptions[n] |
|
3433 | del cmdoptions[n] | |
3431 |
|
3434 | |||
3432 | return (cmd, cmd and i[0] or None, args, options, cmdoptions) |
|
3435 | return (cmd, cmd and i[0] or None, args, options, cmdoptions) | |
3433 |
|
3436 | |||
3434 | external = {} |
|
3437 | external = {} | |
3435 |
|
3438 | |||
3436 | def findext(name): |
|
3439 | def findext(name): | |
3437 | '''return module with given extension name''' |
|
3440 | '''return module with given extension name''' | |
3438 | try: |
|
3441 | try: | |
3439 | return sys.modules[external[name]] |
|
3442 | return sys.modules[external[name]] | |
3440 | except KeyError: |
|
3443 | except KeyError: | |
3441 | for k, v in external.iteritems(): |
|
3444 | for k, v in external.iteritems(): | |
3442 | if k.endswith('.' + name) or k.endswith('/' + name) or v == name: |
|
3445 | if k.endswith('.' + name) or k.endswith('/' + name) or v == name: | |
3443 | return sys.modules[v] |
|
3446 | return sys.modules[v] | |
3444 | raise KeyError(name) |
|
3447 | raise KeyError(name) | |
3445 |
|
3448 | |||
3446 | def dispatch(args): |
|
3449 | def dispatch(args): | |
3447 | for name in 'SIGBREAK', 'SIGHUP', 'SIGTERM': |
|
3450 | for name in 'SIGBREAK', 'SIGHUP', 'SIGTERM': | |
3448 | num = getattr(signal, name, None) |
|
3451 | num = getattr(signal, name, None) | |
3449 | if num: signal.signal(num, catchterm) |
|
3452 | if num: signal.signal(num, catchterm) | |
3450 |
|
3453 | |||
3451 | try: |
|
3454 | try: | |
3452 | u = ui.ui(traceback='--traceback' in sys.argv[1:]) |
|
3455 | u = ui.ui(traceback='--traceback' in sys.argv[1:]) | |
3453 | except util.Abort, inst: |
|
3456 | except util.Abort, inst: | |
3454 | sys.stderr.write(_("abort: %s\n") % inst) |
|
3457 | sys.stderr.write(_("abort: %s\n") % inst) | |
3455 | return -1 |
|
3458 | return -1 | |
3456 |
|
3459 | |||
3457 | for ext_name, load_from_name in u.extensions(): |
|
3460 | for ext_name, load_from_name in u.extensions(): | |
3458 | try: |
|
3461 | try: | |
3459 | if load_from_name: |
|
3462 | if load_from_name: | |
3460 | # the module will be loaded in sys.modules |
|
3463 | # the module will be loaded in sys.modules | |
3461 | # choose an unique name so that it doesn't |
|
3464 | # choose an unique name so that it doesn't | |
3462 | # conflicts with other modules |
|
3465 | # conflicts with other modules | |
3463 | module_name = "hgext_%s" % ext_name.replace('.', '_') |
|
3466 | module_name = "hgext_%s" % ext_name.replace('.', '_') | |
3464 | mod = imp.load_source(module_name, load_from_name) |
|
3467 | mod = imp.load_source(module_name, load_from_name) | |
3465 | else: |
|
3468 | else: | |
3466 | def importh(name): |
|
3469 | def importh(name): | |
3467 | mod = __import__(name) |
|
3470 | mod = __import__(name) | |
3468 | components = name.split('.') |
|
3471 | components = name.split('.') | |
3469 | for comp in components[1:]: |
|
3472 | for comp in components[1:]: | |
3470 | mod = getattr(mod, comp) |
|
3473 | mod = getattr(mod, comp) | |
3471 | return mod |
|
3474 | return mod | |
3472 | try: |
|
3475 | try: | |
3473 | mod = importh("hgext.%s" % ext_name) |
|
3476 | mod = importh("hgext.%s" % ext_name) | |
3474 | except ImportError: |
|
3477 | except ImportError: | |
3475 | mod = importh(ext_name) |
|
3478 | mod = importh(ext_name) | |
3476 | external[ext_name] = mod.__name__ |
|
3479 | external[ext_name] = mod.__name__ | |
3477 | except (util.SignalInterrupt, KeyboardInterrupt): |
|
3480 | except (util.SignalInterrupt, KeyboardInterrupt): | |
3478 | raise |
|
3481 | raise | |
3479 | except Exception, inst: |
|
3482 | except Exception, inst: | |
3480 | u.warn(_("*** failed to import extension %s: %s\n") % (ext_name, inst)) |
|
3483 | u.warn(_("*** failed to import extension %s: %s\n") % (ext_name, inst)) | |
3481 | if u.print_exc(): |
|
3484 | if u.print_exc(): | |
3482 | return 1 |
|
3485 | return 1 | |
3483 |
|
3486 | |||
3484 | for name in external.itervalues(): |
|
3487 | for name in external.itervalues(): | |
3485 | mod = sys.modules[name] |
|
3488 | mod = sys.modules[name] | |
3486 | uisetup = getattr(mod, 'uisetup', None) |
|
3489 | uisetup = getattr(mod, 'uisetup', None) | |
3487 | if uisetup: |
|
3490 | if uisetup: | |
3488 | uisetup(u) |
|
3491 | uisetup(u) | |
3489 | cmdtable = getattr(mod, 'cmdtable', {}) |
|
3492 | cmdtable = getattr(mod, 'cmdtable', {}) | |
3490 | for t in cmdtable: |
|
3493 | for t in cmdtable: | |
3491 | if t in table: |
|
3494 | if t in table: | |
3492 | u.warn(_("module %s overrides %s\n") % (name, t)) |
|
3495 | u.warn(_("module %s overrides %s\n") % (name, t)) | |
3493 | table.update(cmdtable) |
|
3496 | table.update(cmdtable) | |
3494 |
|
3497 | |||
3495 | try: |
|
3498 | try: | |
3496 | cmd, func, args, options, cmdoptions = parse(u, args) |
|
3499 | cmd, func, args, options, cmdoptions = parse(u, args) | |
3497 | if options["time"]: |
|
3500 | if options["time"]: | |
3498 | def get_times(): |
|
3501 | def get_times(): | |
3499 | t = os.times() |
|
3502 | t = os.times() | |
3500 | if t[4] == 0.0: # Windows leaves this as zero, so use time.clock() |
|
3503 | if t[4] == 0.0: # Windows leaves this as zero, so use time.clock() | |
3501 | t = (t[0], t[1], t[2], t[3], time.clock()) |
|
3504 | t = (t[0], t[1], t[2], t[3], time.clock()) | |
3502 | return t |
|
3505 | return t | |
3503 | s = get_times() |
|
3506 | s = get_times() | |
3504 | def print_time(): |
|
3507 | def print_time(): | |
3505 | t = get_times() |
|
3508 | t = get_times() | |
3506 | u.warn(_("Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n") % |
|
3509 | u.warn(_("Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n") % | |
3507 | (t[4]-s[4], t[0]-s[0], t[2]-s[2], t[1]-s[1], t[3]-s[3])) |
|
3510 | (t[4]-s[4], t[0]-s[0], t[2]-s[2], t[1]-s[1], t[3]-s[3])) | |
3508 | atexit.register(print_time) |
|
3511 | atexit.register(print_time) | |
3509 |
|
3512 | |||
3510 | u.updateopts(options["verbose"], options["debug"], options["quiet"], |
|
3513 | u.updateopts(options["verbose"], options["debug"], options["quiet"], | |
3511 | not options["noninteractive"], options["traceback"], |
|
3514 | not options["noninteractive"], options["traceback"], | |
3512 | options["config"]) |
|
3515 | options["config"]) | |
3513 |
|
3516 | |||
3514 | # enter the debugger before command execution |
|
3517 | # enter the debugger before command execution | |
3515 | if options['debugger']: |
|
3518 | if options['debugger']: | |
3516 | pdb.set_trace() |
|
3519 | pdb.set_trace() | |
3517 |
|
3520 | |||
3518 | try: |
|
3521 | try: | |
3519 | if options['cwd']: |
|
3522 | if options['cwd']: | |
3520 | try: |
|
3523 | try: | |
3521 | os.chdir(options['cwd']) |
|
3524 | os.chdir(options['cwd']) | |
3522 | except OSError, inst: |
|
3525 | except OSError, inst: | |
3523 | raise util.Abort('%s: %s' % |
|
3526 | raise util.Abort('%s: %s' % | |
3524 | (options['cwd'], inst.strerror)) |
|
3527 | (options['cwd'], inst.strerror)) | |
3525 |
|
3528 | |||
3526 | path = u.expandpath(options["repository"]) or "" |
|
3529 | path = u.expandpath(options["repository"]) or "" | |
3527 | repo = path and hg.repository(u, path=path) or None |
|
3530 | repo = path and hg.repository(u, path=path) or None | |
3528 |
|
3531 | |||
3529 | if options['help']: |
|
3532 | if options['help']: | |
3530 | return help_(u, cmd, options['version']) |
|
3533 | return help_(u, cmd, options['version']) | |
3531 | elif options['version']: |
|
3534 | elif options['version']: | |
3532 | return show_version(u) |
|
3535 | return show_version(u) | |
3533 | elif not cmd: |
|
3536 | elif not cmd: | |
3534 | return help_(u, 'shortlist') |
|
3537 | return help_(u, 'shortlist') | |
3535 |
|
3538 | |||
3536 | if cmd not in norepo.split(): |
|
3539 | if cmd not in norepo.split(): | |
3537 | try: |
|
3540 | try: | |
3538 | if not repo: |
|
3541 | if not repo: | |
3539 | repo = hg.repository(u, path=path) |
|
3542 | repo = hg.repository(u, path=path) | |
3540 | u = repo.ui |
|
3543 | u = repo.ui | |
3541 | for name in external.itervalues(): |
|
3544 | for name in external.itervalues(): | |
3542 | mod = sys.modules[name] |
|
3545 | mod = sys.modules[name] | |
3543 | if hasattr(mod, 'reposetup'): |
|
3546 | if hasattr(mod, 'reposetup'): | |
3544 | mod.reposetup(u, repo) |
|
3547 | mod.reposetup(u, repo) | |
3545 | except hg.RepoError: |
|
3548 | except hg.RepoError: | |
3546 | if cmd not in optionalrepo.split(): |
|
3549 | if cmd not in optionalrepo.split(): | |
3547 | raise |
|
3550 | raise | |
3548 | d = lambda: func(u, repo, *args, **cmdoptions) |
|
3551 | d = lambda: func(u, repo, *args, **cmdoptions) | |
3549 | else: |
|
3552 | else: | |
3550 | d = lambda: func(u, *args, **cmdoptions) |
|
3553 | d = lambda: func(u, *args, **cmdoptions) | |
3551 |
|
3554 | |||
3552 | # reupdate the options, repo/.hg/hgrc may have changed them |
|
3555 | # reupdate the options, repo/.hg/hgrc may have changed them | |
3553 | u.updateopts(options["verbose"], options["debug"], options["quiet"], |
|
3556 | u.updateopts(options["verbose"], options["debug"], options["quiet"], | |
3554 | not options["noninteractive"], options["traceback"], |
|
3557 | not options["noninteractive"], options["traceback"], | |
3555 | options["config"]) |
|
3558 | options["config"]) | |
3556 |
|
3559 | |||
3557 | try: |
|
3560 | try: | |
3558 | if options['profile']: |
|
3561 | if options['profile']: | |
3559 | import hotshot, hotshot.stats |
|
3562 | import hotshot, hotshot.stats | |
3560 | prof = hotshot.Profile("hg.prof") |
|
3563 | prof = hotshot.Profile("hg.prof") | |
3561 | try: |
|
3564 | try: | |
3562 | try: |
|
3565 | try: | |
3563 | return prof.runcall(d) |
|
3566 | return prof.runcall(d) | |
3564 | except: |
|
3567 | except: | |
3565 | try: |
|
3568 | try: | |
3566 | u.warn(_('exception raised - generating ' |
|
3569 | u.warn(_('exception raised - generating ' | |
3567 | 'profile anyway\n')) |
|
3570 | 'profile anyway\n')) | |
3568 | except: |
|
3571 | except: | |
3569 | pass |
|
3572 | pass | |
3570 | raise |
|
3573 | raise | |
3571 | finally: |
|
3574 | finally: | |
3572 | prof.close() |
|
3575 | prof.close() | |
3573 | stats = hotshot.stats.load("hg.prof") |
|
3576 | stats = hotshot.stats.load("hg.prof") | |
3574 | stats.strip_dirs() |
|
3577 | stats.strip_dirs() | |
3575 | stats.sort_stats('time', 'calls') |
|
3578 | stats.sort_stats('time', 'calls') | |
3576 | stats.print_stats(40) |
|
3579 | stats.print_stats(40) | |
3577 | elif options['lsprof']: |
|
3580 | elif options['lsprof']: | |
3578 | try: |
|
3581 | try: | |
3579 | from mercurial import lsprof |
|
3582 | from mercurial import lsprof | |
3580 | except ImportError: |
|
3583 | except ImportError: | |
3581 | raise util.Abort(_( |
|
3584 | raise util.Abort(_( | |
3582 | 'lsprof not available - install from ' |
|
3585 | 'lsprof not available - install from ' | |
3583 | 'http://codespeak.net/svn/user/arigo/hack/misc/lsprof/')) |
|
3586 | 'http://codespeak.net/svn/user/arigo/hack/misc/lsprof/')) | |
3584 | p = lsprof.Profiler() |
|
3587 | p = lsprof.Profiler() | |
3585 | p.enable(subcalls=True) |
|
3588 | p.enable(subcalls=True) | |
3586 | try: |
|
3589 | try: | |
3587 | return d() |
|
3590 | return d() | |
3588 | finally: |
|
3591 | finally: | |
3589 | p.disable() |
|
3592 | p.disable() | |
3590 | stats = lsprof.Stats(p.getstats()) |
|
3593 | stats = lsprof.Stats(p.getstats()) | |
3591 | stats.sort() |
|
3594 | stats.sort() | |
3592 | stats.pprint(top=10, file=sys.stderr, climit=5) |
|
3595 | stats.pprint(top=10, file=sys.stderr, climit=5) | |
3593 | else: |
|
3596 | else: | |
3594 | return d() |
|
3597 | return d() | |
3595 | finally: |
|
3598 | finally: | |
3596 | u.flush() |
|
3599 | u.flush() | |
3597 | except: |
|
3600 | except: | |
3598 | # enter the debugger when we hit an exception |
|
3601 | # enter the debugger when we hit an exception | |
3599 | if options['debugger']: |
|
3602 | if options['debugger']: | |
3600 | pdb.post_mortem(sys.exc_info()[2]) |
|
3603 | pdb.post_mortem(sys.exc_info()[2]) | |
3601 | u.print_exc() |
|
3604 | u.print_exc() | |
3602 | raise |
|
3605 | raise | |
3603 | except ParseError, inst: |
|
3606 | except ParseError, inst: | |
3604 | if inst.args[0]: |
|
3607 | if inst.args[0]: | |
3605 | u.warn(_("hg %s: %s\n") % (inst.args[0], inst.args[1])) |
|
3608 | u.warn(_("hg %s: %s\n") % (inst.args[0], inst.args[1])) | |
3606 | help_(u, inst.args[0]) |
|
3609 | help_(u, inst.args[0]) | |
3607 | else: |
|
3610 | else: | |
3608 | u.warn(_("hg: %s\n") % inst.args[1]) |
|
3611 | u.warn(_("hg: %s\n") % inst.args[1]) | |
3609 | help_(u, 'shortlist') |
|
3612 | help_(u, 'shortlist') | |
3610 | except AmbiguousCommand, inst: |
|
3613 | except AmbiguousCommand, inst: | |
3611 | u.warn(_("hg: command '%s' is ambiguous:\n %s\n") % |
|
3614 | u.warn(_("hg: command '%s' is ambiguous:\n %s\n") % | |
3612 | (inst.args[0], " ".join(inst.args[1]))) |
|
3615 | (inst.args[0], " ".join(inst.args[1]))) | |
3613 | except UnknownCommand, inst: |
|
3616 | except UnknownCommand, inst: | |
3614 | u.warn(_("hg: unknown command '%s'\n") % inst.args[0]) |
|
3617 | u.warn(_("hg: unknown command '%s'\n") % inst.args[0]) | |
3615 | help_(u, 'shortlist') |
|
3618 | help_(u, 'shortlist') | |
3616 | except hg.RepoError, inst: |
|
3619 | except hg.RepoError, inst: | |
3617 | u.warn(_("abort: %s!\n") % inst) |
|
3620 | u.warn(_("abort: %s!\n") % inst) | |
3618 | except lock.LockHeld, inst: |
|
3621 | except lock.LockHeld, inst: | |
3619 | if inst.errno == errno.ETIMEDOUT: |
|
3622 | if inst.errno == errno.ETIMEDOUT: | |
3620 | reason = _('timed out waiting for lock held by %s') % inst.locker |
|
3623 | reason = _('timed out waiting for lock held by %s') % inst.locker | |
3621 | else: |
|
3624 | else: | |
3622 | reason = _('lock held by %s') % inst.locker |
|
3625 | reason = _('lock held by %s') % inst.locker | |
3623 | u.warn(_("abort: %s: %s\n") % (inst.desc or inst.filename, reason)) |
|
3626 | u.warn(_("abort: %s: %s\n") % (inst.desc or inst.filename, reason)) | |
3624 | except lock.LockUnavailable, inst: |
|
3627 | except lock.LockUnavailable, inst: | |
3625 | u.warn(_("abort: could not lock %s: %s\n") % |
|
3628 | u.warn(_("abort: could not lock %s: %s\n") % | |
3626 | (inst.desc or inst.filename, inst.strerror)) |
|
3629 | (inst.desc or inst.filename, inst.strerror)) | |
3627 | except revlog.RevlogError, inst: |
|
3630 | except revlog.RevlogError, inst: | |
3628 | u.warn(_("abort: "), inst, "!\n") |
|
3631 | u.warn(_("abort: "), inst, "!\n") | |
3629 | except util.SignalInterrupt: |
|
3632 | except util.SignalInterrupt: | |
3630 | u.warn(_("killed!\n")) |
|
3633 | u.warn(_("killed!\n")) | |
3631 | except KeyboardInterrupt: |
|
3634 | except KeyboardInterrupt: | |
3632 | try: |
|
3635 | try: | |
3633 | u.warn(_("interrupted!\n")) |
|
3636 | u.warn(_("interrupted!\n")) | |
3634 | except IOError, inst: |
|
3637 | except IOError, inst: | |
3635 | if inst.errno == errno.EPIPE: |
|
3638 | if inst.errno == errno.EPIPE: | |
3636 | if u.debugflag: |
|
3639 | if u.debugflag: | |
3637 | u.warn(_("\nbroken pipe\n")) |
|
3640 | u.warn(_("\nbroken pipe\n")) | |
3638 | else: |
|
3641 | else: | |
3639 | raise |
|
3642 | raise | |
3640 | except IOError, inst: |
|
3643 | except IOError, inst: | |
3641 | if hasattr(inst, "code"): |
|
3644 | if hasattr(inst, "code"): | |
3642 | u.warn(_("abort: %s\n") % inst) |
|
3645 | u.warn(_("abort: %s\n") % inst) | |
3643 | elif hasattr(inst, "reason"): |
|
3646 | elif hasattr(inst, "reason"): | |
3644 | u.warn(_("abort: error: %s\n") % inst.reason[1]) |
|
3647 | u.warn(_("abort: error: %s\n") % inst.reason[1]) | |
3645 | elif hasattr(inst, "args") and inst[0] == errno.EPIPE: |
|
3648 | elif hasattr(inst, "args") and inst[0] == errno.EPIPE: | |
3646 | if u.debugflag: |
|
3649 | if u.debugflag: | |
3647 | u.warn(_("broken pipe\n")) |
|
3650 | u.warn(_("broken pipe\n")) | |
3648 | elif getattr(inst, "strerror", None): |
|
3651 | elif getattr(inst, "strerror", None): | |
3649 | if getattr(inst, "filename", None): |
|
3652 | if getattr(inst, "filename", None): | |
3650 | u.warn(_("abort: %s - %s\n") % (inst.strerror, inst.filename)) |
|
3653 | u.warn(_("abort: %s - %s\n") % (inst.strerror, inst.filename)) | |
3651 | else: |
|
3654 | else: | |
3652 | u.warn(_("abort: %s\n") % inst.strerror) |
|
3655 | u.warn(_("abort: %s\n") % inst.strerror) | |
3653 | else: |
|
3656 | else: | |
3654 | raise |
|
3657 | raise | |
3655 | except OSError, inst: |
|
3658 | except OSError, inst: | |
3656 | if hasattr(inst, "filename"): |
|
3659 | if hasattr(inst, "filename"): | |
3657 | u.warn(_("abort: %s: %s\n") % (inst.strerror, inst.filename)) |
|
3660 | u.warn(_("abort: %s: %s\n") % (inst.strerror, inst.filename)) | |
3658 | else: |
|
3661 | else: | |
3659 | u.warn(_("abort: %s\n") % inst.strerror) |
|
3662 | u.warn(_("abort: %s\n") % inst.strerror) | |
3660 | except util.Abort, inst: |
|
3663 | except util.Abort, inst: | |
3661 | u.warn(_('abort: '), inst.args[0] % inst.args[1:], '\n') |
|
3664 | u.warn(_('abort: '), inst.args[0] % inst.args[1:], '\n') | |
3662 | except TypeError, inst: |
|
3665 | except TypeError, inst: | |
3663 | # was this an argument error? |
|
3666 | # was this an argument error? | |
3664 | tb = traceback.extract_tb(sys.exc_info()[2]) |
|
3667 | tb = traceback.extract_tb(sys.exc_info()[2]) | |
3665 | if len(tb) > 2: # no |
|
3668 | if len(tb) > 2: # no | |
3666 | raise |
|
3669 | raise | |
3667 | u.debug(inst, "\n") |
|
3670 | u.debug(inst, "\n") | |
3668 | u.warn(_("%s: invalid arguments\n") % cmd) |
|
3671 | u.warn(_("%s: invalid arguments\n") % cmd) | |
3669 | help_(u, cmd) |
|
3672 | help_(u, cmd) | |
3670 | except SystemExit, inst: |
|
3673 | except SystemExit, inst: | |
3671 | # Commands shouldn't sys.exit directly, but give a return code. |
|
3674 | # Commands shouldn't sys.exit directly, but give a return code. | |
3672 | # Just in case catch this and and pass exit code to caller. |
|
3675 | # Just in case catch this and and pass exit code to caller. | |
3673 | return inst.code |
|
3676 | return inst.code | |
3674 | except: |
|
3677 | except: | |
3675 | u.warn(_("** unknown exception encountered, details follow\n")) |
|
3678 | u.warn(_("** unknown exception encountered, details follow\n")) | |
3676 | u.warn(_("** report bug details to " |
|
3679 | u.warn(_("** report bug details to " | |
3677 | "http://www.selenic.com/mercurial/bts\n")) |
|
3680 | "http://www.selenic.com/mercurial/bts\n")) | |
3678 | u.warn(_("** or mercurial@selenic.com\n")) |
|
3681 | u.warn(_("** or mercurial@selenic.com\n")) | |
3679 | u.warn(_("** Mercurial Distributed SCM (version %s)\n") |
|
3682 | u.warn(_("** Mercurial Distributed SCM (version %s)\n") | |
3680 | % version.get_version()) |
|
3683 | % version.get_version()) | |
3681 | raise |
|
3684 | raise | |
3682 |
|
3685 | |||
3683 | return -1 |
|
3686 | return -1 |
@@ -1,221 +1,231 b'' | |||||
1 | # hg.py - repository classes for mercurial |
|
1 | # hg.py - repository classes for mercurial | |
2 | # |
|
2 | # | |
3 | # Copyright 2005 Matt Mackall <mpm@selenic.com> |
|
3 | # Copyright 2005 Matt Mackall <mpm@selenic.com> | |
4 | # |
|
4 | # | |
5 | # This software may be used and distributed according to the terms |
|
5 | # This software may be used and distributed according to the terms | |
6 | # of the GNU General Public License, incorporated herein by reference. |
|
6 | # of the GNU General Public License, incorporated herein by reference. | |
7 |
|
7 | |||
8 | from node import * |
|
8 | from node import * | |
9 | from repo import * |
|
9 | from repo import * | |
10 | from demandload import * |
|
10 | from demandload import * | |
11 | from i18n import gettext as _ |
|
11 | from i18n import gettext as _ | |
12 | demandload(globals(), "localrepo bundlerepo httprepo sshrepo statichttprepo") |
|
12 | demandload(globals(), "localrepo bundlerepo httprepo sshrepo statichttprepo") | |
13 | demandload(globals(), "errno lock os shutil util merge") |
|
13 | demandload(globals(), "errno lock os shutil util merge@_merge") | |
14 |
|
14 | |||
15 | def _local(path): |
|
15 | def _local(path): | |
16 | return (os.path.isfile(path and util.drop_scheme('file', path)) and |
|
16 | return (os.path.isfile(path and util.drop_scheme('file', path)) and | |
17 | bundlerepo or localrepo) |
|
17 | bundlerepo or localrepo) | |
18 |
|
18 | |||
19 | schemes = { |
|
19 | schemes = { | |
20 | 'bundle': bundlerepo, |
|
20 | 'bundle': bundlerepo, | |
21 | 'file': _local, |
|
21 | 'file': _local, | |
22 | 'hg': httprepo, |
|
22 | 'hg': httprepo, | |
23 | 'http': httprepo, |
|
23 | 'http': httprepo, | |
24 | 'https': httprepo, |
|
24 | 'https': httprepo, | |
25 | 'old-http': statichttprepo, |
|
25 | 'old-http': statichttprepo, | |
26 | 'ssh': sshrepo, |
|
26 | 'ssh': sshrepo, | |
27 | 'static-http': statichttprepo, |
|
27 | 'static-http': statichttprepo, | |
28 | } |
|
28 | } | |
29 |
|
29 | |||
30 | def _lookup(path): |
|
30 | def _lookup(path): | |
31 | scheme = 'file' |
|
31 | scheme = 'file' | |
32 | if path: |
|
32 | if path: | |
33 | c = path.find(':') |
|
33 | c = path.find(':') | |
34 | if c > 0: |
|
34 | if c > 0: | |
35 | scheme = path[:c] |
|
35 | scheme = path[:c] | |
36 | thing = schemes.get(scheme) or schemes['file'] |
|
36 | thing = schemes.get(scheme) or schemes['file'] | |
37 | try: |
|
37 | try: | |
38 | return thing(path) |
|
38 | return thing(path) | |
39 | except TypeError: |
|
39 | except TypeError: | |
40 | return thing |
|
40 | return thing | |
41 |
|
41 | |||
42 | def islocal(repo): |
|
42 | def islocal(repo): | |
43 | '''return true if repo or path is local''' |
|
43 | '''return true if repo or path is local''' | |
44 | if isinstance(repo, str): |
|
44 | if isinstance(repo, str): | |
45 | try: |
|
45 | try: | |
46 | return _lookup(repo).islocal(repo) |
|
46 | return _lookup(repo).islocal(repo) | |
47 | except AttributeError: |
|
47 | except AttributeError: | |
48 | return False |
|
48 | return False | |
49 | return repo.local() |
|
49 | return repo.local() | |
50 |
|
50 | |||
51 | def repository(ui, path=None, create=False): |
|
51 | def repository(ui, path=None, create=False): | |
52 | """return a repository object for the specified path""" |
|
52 | """return a repository object for the specified path""" | |
53 | return _lookup(path).instance(ui, path, create) |
|
53 | return _lookup(path).instance(ui, path, create) | |
54 |
|
54 | |||
55 | def defaultdest(source): |
|
55 | def defaultdest(source): | |
56 | '''return default destination of clone if none is given''' |
|
56 | '''return default destination of clone if none is given''' | |
57 | return os.path.basename(os.path.normpath(source)) |
|
57 | return os.path.basename(os.path.normpath(source)) | |
58 |
|
58 | |||
59 | def clone(ui, source, dest=None, pull=False, rev=None, update=True, |
|
59 | def clone(ui, source, dest=None, pull=False, rev=None, update=True, | |
60 | stream=False): |
|
60 | stream=False): | |
61 | """Make a copy of an existing repository. |
|
61 | """Make a copy of an existing repository. | |
62 |
|
62 | |||
63 | Create a copy of an existing repository in a new directory. The |
|
63 | Create a copy of an existing repository in a new directory. The | |
64 | source and destination are URLs, as passed to the repository |
|
64 | source and destination are URLs, as passed to the repository | |
65 | function. Returns a pair of repository objects, the source and |
|
65 | function. Returns a pair of repository objects, the source and | |
66 | newly created destination. |
|
66 | newly created destination. | |
67 |
|
67 | |||
68 | The location of the source is added to the new repository's |
|
68 | The location of the source is added to the new repository's | |
69 | .hg/hgrc file, as the default to be used for future pulls and |
|
69 | .hg/hgrc file, as the default to be used for future pulls and | |
70 | pushes. |
|
70 | pushes. | |
71 |
|
71 | |||
72 | If an exception is raised, the partly cloned/updated destination |
|
72 | If an exception is raised, the partly cloned/updated destination | |
73 | repository will be deleted. |
|
73 | repository will be deleted. | |
74 |
|
74 | |||
75 | Arguments: |
|
75 | Arguments: | |
76 |
|
76 | |||
77 | source: repository object or URL |
|
77 | source: repository object or URL | |
78 |
|
78 | |||
79 | dest: URL of destination repository to create (defaults to base |
|
79 | dest: URL of destination repository to create (defaults to base | |
80 | name of source repository) |
|
80 | name of source repository) | |
81 |
|
81 | |||
82 | pull: always pull from source repository, even in local case |
|
82 | pull: always pull from source repository, even in local case | |
83 |
|
83 | |||
84 | stream: stream raw data uncompressed from repository (fast over |
|
84 | stream: stream raw data uncompressed from repository (fast over | |
85 | LAN, slow over WAN) |
|
85 | LAN, slow over WAN) | |
86 |
|
86 | |||
87 | rev: revision to clone up to (implies pull=True) |
|
87 | rev: revision to clone up to (implies pull=True) | |
88 |
|
88 | |||
89 | update: update working directory after clone completes, if |
|
89 | update: update working directory after clone completes, if | |
90 | destination is local repository |
|
90 | destination is local repository | |
91 | """ |
|
91 | """ | |
92 | if isinstance(source, str): |
|
92 | if isinstance(source, str): | |
93 | src_repo = repository(ui, source) |
|
93 | src_repo = repository(ui, source) | |
94 | else: |
|
94 | else: | |
95 | src_repo = source |
|
95 | src_repo = source | |
96 | source = src_repo.url() |
|
96 | source = src_repo.url() | |
97 |
|
97 | |||
98 | if dest is None: |
|
98 | if dest is None: | |
99 | dest = defaultdest(source) |
|
99 | dest = defaultdest(source) | |
100 |
|
100 | |||
101 | def localpath(path): |
|
101 | def localpath(path): | |
102 | if path.startswith('file://'): |
|
102 | if path.startswith('file://'): | |
103 | return path[7:] |
|
103 | return path[7:] | |
104 | if path.startswith('file:'): |
|
104 | if path.startswith('file:'): | |
105 | return path[5:] |
|
105 | return path[5:] | |
106 | return path |
|
106 | return path | |
107 |
|
107 | |||
108 | dest = localpath(dest) |
|
108 | dest = localpath(dest) | |
109 | source = localpath(source) |
|
109 | source = localpath(source) | |
110 |
|
110 | |||
111 | if os.path.exists(dest): |
|
111 | if os.path.exists(dest): | |
112 | raise util.Abort(_("destination '%s' already exists"), dest) |
|
112 | raise util.Abort(_("destination '%s' already exists"), dest) | |
113 |
|
113 | |||
114 | class DirCleanup(object): |
|
114 | class DirCleanup(object): | |
115 | def __init__(self, dir_): |
|
115 | def __init__(self, dir_): | |
116 | self.rmtree = shutil.rmtree |
|
116 | self.rmtree = shutil.rmtree | |
117 | self.dir_ = dir_ |
|
117 | self.dir_ = dir_ | |
118 | def close(self): |
|
118 | def close(self): | |
119 | self.dir_ = None |
|
119 | self.dir_ = None | |
120 | def __del__(self): |
|
120 | def __del__(self): | |
121 | if self.dir_: |
|
121 | if self.dir_: | |
122 | self.rmtree(self.dir_, True) |
|
122 | self.rmtree(self.dir_, True) | |
123 |
|
123 | |||
124 | dest_repo = None |
|
124 | dest_repo = None | |
125 | try: |
|
125 | try: | |
126 | dest_repo = repository(ui, dest) |
|
126 | dest_repo = repository(ui, dest) | |
127 | raise util.Abort(_("destination '%s' already exists." % dest)) |
|
127 | raise util.Abort(_("destination '%s' already exists." % dest)) | |
128 | except RepoError: |
|
128 | except RepoError: | |
129 | dest_repo = repository(ui, dest, create=True) |
|
129 | dest_repo = repository(ui, dest, create=True) | |
130 |
|
130 | |||
131 | dest_path = None |
|
131 | dest_path = None | |
132 | dir_cleanup = None |
|
132 | dir_cleanup = None | |
133 | if dest_repo.local(): |
|
133 | if dest_repo.local(): | |
134 | dest_path = os.path.realpath(dest_repo.root) |
|
134 | dest_path = os.path.realpath(dest_repo.root) | |
135 | dir_cleanup = DirCleanup(dest_path) |
|
135 | dir_cleanup = DirCleanup(dest_path) | |
136 |
|
136 | |||
137 | abspath = source |
|
137 | abspath = source | |
138 | copy = False |
|
138 | copy = False | |
139 | if src_repo.local() and dest_repo.local(): |
|
139 | if src_repo.local() and dest_repo.local(): | |
140 | abspath = os.path.abspath(source) |
|
140 | abspath = os.path.abspath(source) | |
141 | copy = not pull and not rev |
|
141 | copy = not pull and not rev | |
142 |
|
142 | |||
143 | src_lock, dest_lock = None, None |
|
143 | src_lock, dest_lock = None, None | |
144 | if copy: |
|
144 | if copy: | |
145 | try: |
|
145 | try: | |
146 | # we use a lock here because if we race with commit, we |
|
146 | # we use a lock here because if we race with commit, we | |
147 | # can end up with extra data in the cloned revlogs that's |
|
147 | # can end up with extra data in the cloned revlogs that's | |
148 | # not pointed to by changesets, thus causing verify to |
|
148 | # not pointed to by changesets, thus causing verify to | |
149 | # fail |
|
149 | # fail | |
150 | src_lock = src_repo.lock() |
|
150 | src_lock = src_repo.lock() | |
151 | except lock.LockException: |
|
151 | except lock.LockException: | |
152 | copy = False |
|
152 | copy = False | |
153 |
|
153 | |||
154 | if copy: |
|
154 | if copy: | |
155 | # we lock here to avoid premature writing to the target |
|
155 | # we lock here to avoid premature writing to the target | |
156 | dest_lock = lock.lock(os.path.join(dest_path, ".hg", "lock")) |
|
156 | dest_lock = lock.lock(os.path.join(dest_path, ".hg", "lock")) | |
157 |
|
157 | |||
158 | # we need to remove the (empty) data dir in dest so copyfiles |
|
158 | # we need to remove the (empty) data dir in dest so copyfiles | |
159 | # can do its work |
|
159 | # can do its work | |
160 | os.rmdir(os.path.join(dest_path, ".hg", "data")) |
|
160 | os.rmdir(os.path.join(dest_path, ".hg", "data")) | |
161 | files = "data 00manifest.d 00manifest.i 00changelog.d 00changelog.i" |
|
161 | files = "data 00manifest.d 00manifest.i 00changelog.d 00changelog.i" | |
162 | for f in files.split(): |
|
162 | for f in files.split(): | |
163 | src = os.path.join(source, ".hg", f) |
|
163 | src = os.path.join(source, ".hg", f) | |
164 | dst = os.path.join(dest_path, ".hg", f) |
|
164 | dst = os.path.join(dest_path, ".hg", f) | |
165 | try: |
|
165 | try: | |
166 | util.copyfiles(src, dst) |
|
166 | util.copyfiles(src, dst) | |
167 | except OSError, inst: |
|
167 | except OSError, inst: | |
168 | if inst.errno != errno.ENOENT: |
|
168 | if inst.errno != errno.ENOENT: | |
169 | raise |
|
169 | raise | |
170 |
|
170 | |||
171 | # we need to re-init the repo after manually copying the data |
|
171 | # we need to re-init the repo after manually copying the data | |
172 | # into it |
|
172 | # into it | |
173 | dest_repo = repository(ui, dest) |
|
173 | dest_repo = repository(ui, dest) | |
174 |
|
174 | |||
175 | else: |
|
175 | else: | |
176 | revs = None |
|
176 | revs = None | |
177 | if rev: |
|
177 | if rev: | |
178 | if not src_repo.local(): |
|
178 | if not src_repo.local(): | |
179 | raise util.Abort(_("clone by revision not supported yet " |
|
179 | raise util.Abort(_("clone by revision not supported yet " | |
180 | "for remote repositories")) |
|
180 | "for remote repositories")) | |
181 | revs = [src_repo.lookup(r) for r in rev] |
|
181 | revs = [src_repo.lookup(r) for r in rev] | |
182 |
|
182 | |||
183 | if dest_repo.local(): |
|
183 | if dest_repo.local(): | |
184 | dest_repo.clone(src_repo, heads=revs, stream=stream) |
|
184 | dest_repo.clone(src_repo, heads=revs, stream=stream) | |
185 | elif src_repo.local(): |
|
185 | elif src_repo.local(): | |
186 | src_repo.push(dest_repo, revs=revs) |
|
186 | src_repo.push(dest_repo, revs=revs) | |
187 | else: |
|
187 | else: | |
188 | raise util.Abort(_("clone from remote to remote not supported")) |
|
188 | raise util.Abort(_("clone from remote to remote not supported")) | |
189 |
|
189 | |||
190 | if src_lock: |
|
190 | if src_lock: | |
191 | src_lock.release() |
|
191 | src_lock.release() | |
192 |
|
192 | |||
193 | if dest_repo.local(): |
|
193 | if dest_repo.local(): | |
194 | fp = dest_repo.opener("hgrc", "w", text=True) |
|
194 | fp = dest_repo.opener("hgrc", "w", text=True) | |
195 | fp.write("[paths]\n") |
|
195 | fp.write("[paths]\n") | |
196 | fp.write("default = %s\n" % abspath) |
|
196 | fp.write("default = %s\n" % abspath) | |
197 | fp.close() |
|
197 | fp.close() | |
198 |
|
198 | |||
199 | if dest_lock: |
|
199 | if dest_lock: | |
200 | dest_lock.release() |
|
200 | dest_lock.release() | |
201 |
|
201 | |||
202 | if update: |
|
202 | if update: | |
203 | merge.update(dest_repo, dest_repo.changelog.tip()) |
|
203 | _merge.update(dest_repo, dest_repo.changelog.tip()) | |
204 | if dir_cleanup: |
|
204 | if dir_cleanup: | |
205 | dir_cleanup.close() |
|
205 | dir_cleanup.close() | |
206 |
|
206 | |||
207 | return src_repo, dest_repo |
|
207 | return src_repo, dest_repo | |
208 |
|
208 | |||
|
209 | def update(repo, node): | |||
|
210 | """update the working directory to node, merging linear changes""" | |||
|
211 | return _merge.update(repo, node) | |||
209 |
|
212 | |||
210 | # This should instead be several functions with short arglists, like |
|
213 | def clean(repo, node, wlock=None, show_stats=True): | |
211 | # update/merge/revert |
|
214 | """forcibly switch the working directory to node, clobbering changes""" | |
|
215 | return _merge.update(repo, node, force=True, wlock=wlock, | |||
|
216 | show_stats=show_stats) | |||
212 |
|
217 | |||
213 | def update(repo, node, allow=False, force=False, choose=None, |
|
218 | def merge(repo, node, force=None, remind=True, wlock=None): | |
214 | moddirstate=True, forcemerge=False, wlock=None, show_stats=True): |
|
219 | """branch merge with node, resolving changes""" | |
215 |
return merge.update(repo, node, allow, force, |
|
220 | return _merge.update(repo, node, allow=True, forcemerge=force, | |
216 |
|
|
221 | remind=remind, wlock=wlock) | |
|
222 | ||||
|
223 | def revert(repo, node, choose): | |||
|
224 | """revert changes to revision in node without updating dirstate""" | |||
|
225 | return _merge.update(repo, node, force=True, choose=choose, | |||
|
226 | moddirstate=False, show_stats=False) | |||
217 |
|
227 | |||
218 | def verify(repo): |
|
228 | def verify(repo): | |
219 | """verify the consistency of a repository""" |
|
229 | """verify the consistency of a repository""" | |
220 | import verify as _verify |
|
230 | import verify as _verify | |
221 | return _verify.verify(repo) |
|
231 | return _verify.verify(repo) |
@@ -1,152 +1,152 b'' | |||||
1 | (the addremove command is deprecated; use add and remove --after instead) |
|
1 | (the addremove command is deprecated; use add and remove --after instead) | |
2 | adding a |
|
2 | adding a | |
3 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
3 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
4 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
4 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
5 | diff -r 33aaa84a386b a |
|
5 | diff -r 33aaa84a386b a | |
6 | --- a/a |
|
6 | --- a/a | |
7 | +++ b/a |
|
7 | +++ b/a | |
8 | @@ -1,1 +1,1 @@ a |
|
8 | @@ -1,1 +1,1 @@ a | |
9 | -a |
|
9 | -a | |
10 | +abc |
|
10 | +abc | |
11 | (the addremove command is deprecated; use add and remove --after instead) |
|
11 | (the addremove command is deprecated; use add and remove --after instead) | |
12 | adding b |
|
12 | adding b | |
13 | M a |
|
13 | M a | |
14 | changeset: 0:33aaa84a386b |
|
14 | changeset: 0:33aaa84a386b | |
15 | user: test |
|
15 | user: test | |
16 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
16 | date: Mon Jan 12 13:46:40 1970 +0000 | |
17 | summary: 1 |
|
17 | summary: 1 | |
18 |
|
18 | |||
19 | resolving manifests |
|
19 | resolving manifests | |
20 |
force |
|
20 | force False allow False moddirstate True linear True | |
21 | ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e |
|
21 | ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e | |
22 | a versions differ, resolve |
|
22 | a versions differ, resolve | |
23 | remote created b |
|
23 | remote created b | |
24 | getting b |
|
24 | getting b | |
25 | merging a |
|
25 | merging a | |
26 | resolving a |
|
26 | resolving a | |
27 | file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2 |
|
27 | file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2 | |
28 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
28 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
29 | changeset: 1:802f095af299 |
|
29 | changeset: 1:802f095af299 | |
30 | tag: tip |
|
30 | tag: tip | |
31 | user: test |
|
31 | user: test | |
32 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
32 | date: Mon Jan 12 13:46:40 1970 +0000 | |
33 | summary: 2 |
|
33 | summary: 2 | |
34 |
|
34 | |||
35 | resolving manifests |
|
35 | resolving manifests | |
36 |
force |
|
36 | force False allow False moddirstate True linear True | |
37 | ancestor a0c8bcbbb45c local 1165e8bd193e remote a0c8bcbbb45c |
|
37 | ancestor a0c8bcbbb45c local 1165e8bd193e remote a0c8bcbbb45c | |
38 | remote deleted b |
|
38 | remote deleted b | |
39 | removing b |
|
39 | removing b | |
40 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
40 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
41 | changeset: 0:33aaa84a386b |
|
41 | changeset: 0:33aaa84a386b | |
42 | user: test |
|
42 | user: test | |
43 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
43 | date: Mon Jan 12 13:46:40 1970 +0000 | |
44 | summary: 1 |
|
44 | summary: 1 | |
45 |
|
45 | |||
46 | abort: there is nothing to merge, just use 'hg update' or look at 'hg heads' |
|
46 | abort: there is nothing to merge, just use 'hg update' or look at 'hg heads' | |
47 | failed |
|
47 | failed | |
48 | changeset: 0:33aaa84a386b |
|
48 | changeset: 0:33aaa84a386b | |
49 | user: test |
|
49 | user: test | |
50 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
50 | date: Mon Jan 12 13:46:40 1970 +0000 | |
51 | summary: 1 |
|
51 | summary: 1 | |
52 |
|
52 | |||
53 | resolving manifests |
|
53 | resolving manifests | |
54 |
force |
|
54 | force False allow False moddirstate True linear True | |
55 | ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e |
|
55 | ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e | |
56 | a versions differ, resolve |
|
56 | a versions differ, resolve | |
57 | remote created b |
|
57 | remote created b | |
58 | getting b |
|
58 | getting b | |
59 | merging a |
|
59 | merging a | |
60 | resolving a |
|
60 | resolving a | |
61 | file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2 |
|
61 | file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2 | |
62 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
62 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
63 | changeset: 1:802f095af299 |
|
63 | changeset: 1:802f095af299 | |
64 | tag: tip |
|
64 | tag: tip | |
65 | user: test |
|
65 | user: test | |
66 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
66 | date: Mon Jan 12 13:46:40 1970 +0000 | |
67 | summary: 2 |
|
67 | summary: 2 | |
68 |
|
68 | |||
69 | changeset: 1:802f095af299cde27a85b2f056aef3829870956c |
|
69 | changeset: 1:802f095af299cde27a85b2f056aef3829870956c | |
70 | tag: tip |
|
70 | tag: tip | |
71 | user: test |
|
71 | user: test | |
72 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
72 | date: Mon Jan 12 13:46:40 1970 +0000 | |
73 | files: a b |
|
73 | files: a b | |
74 | description: |
|
74 | description: | |
75 | 2 |
|
75 | 2 | |
76 |
|
76 | |||
77 |
|
77 | |||
78 | changeset: 0:33aaa84a386bd609094aeb21a97c09436c482ef1 |
|
78 | changeset: 0:33aaa84a386bd609094aeb21a97c09436c482ef1 | |
79 | user: test |
|
79 | user: test | |
80 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
80 | date: Mon Jan 12 13:46:40 1970 +0000 | |
81 | files: a |
|
81 | files: a | |
82 | description: |
|
82 | description: | |
83 | 1 |
|
83 | 1 | |
84 |
|
84 | |||
85 |
|
85 | |||
86 | diff -r 802f095af299 a |
|
86 | diff -r 802f095af299 a | |
87 | --- a/a |
|
87 | --- a/a | |
88 | +++ b/a |
|
88 | +++ b/a | |
89 | @@ -1,1 +1,1 @@ a2 |
|
89 | @@ -1,1 +1,1 @@ a2 | |
90 | -a2 |
|
90 | -a2 | |
91 | +abc |
|
91 | +abc | |
92 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
92 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
93 | (the addremove command is deprecated; use add and remove --after instead) |
|
93 | (the addremove command is deprecated; use add and remove --after instead) | |
94 | adding b |
|
94 | adding b | |
95 | M a |
|
95 | M a | |
96 | changeset: 1:802f095af299 |
|
96 | changeset: 1:802f095af299 | |
97 | user: test |
|
97 | user: test | |
98 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
98 | date: Mon Jan 12 13:46:40 1970 +0000 | |
99 | summary: 2 |
|
99 | summary: 2 | |
100 |
|
100 | |||
101 | resolving manifests |
|
101 | resolving manifests | |
102 |
force |
|
102 | force False allow False moddirstate True linear False | |
103 | ancestor a0c8bcbbb45c local 1165e8bd193e remote 4096f2872392 |
|
103 | ancestor a0c8bcbbb45c local 1165e8bd193e remote 4096f2872392 | |
104 | a versions differ, resolve |
|
104 | a versions differ, resolve | |
105 | b versions differ, resolve |
|
105 | b versions differ, resolve | |
106 | this update spans a branch affecting the following files: |
|
106 | this update spans a branch affecting the following files: | |
107 | a (resolve) |
|
107 | a (resolve) | |
108 | b (resolve) |
|
108 | b (resolve) | |
109 | aborting update spanning branches! |
|
109 | aborting update spanning branches! | |
110 | (use 'hg merge' to merge across branches or 'hg update -C' to lose changes) |
|
110 | (use 'hg merge' to merge across branches or 'hg update -C' to lose changes) | |
111 | failed |
|
111 | failed | |
112 | abort: outstanding uncommitted changes |
|
112 | abort: outstanding uncommitted changes | |
113 | failed |
|
113 | failed | |
114 | resolving manifests |
|
114 | resolving manifests | |
115 | force False allow True moddirstate True linear False |
|
115 | force False allow True moddirstate True linear False | |
116 | ancestor a0c8bcbbb45c local 1165e8bd193e remote 4096f2872392 |
|
116 | ancestor a0c8bcbbb45c local 1165e8bd193e remote 4096f2872392 | |
117 | a versions differ, resolve |
|
117 | a versions differ, resolve | |
118 | b versions differ, resolve |
|
118 | b versions differ, resolve | |
119 | merging a |
|
119 | merging a | |
120 | resolving a |
|
120 | resolving a | |
121 | file a: my d730145abbf9 other 13e0d5f949fa ancestor b789fdd96dc2 |
|
121 | file a: my d730145abbf9 other 13e0d5f949fa ancestor b789fdd96dc2 | |
122 | merging b |
|
122 | merging b | |
123 | resolving b |
|
123 | resolving b | |
124 | file b: my 1e88685f5dde other 61de8c7723ca ancestor 000000000000 |
|
124 | file b: my 1e88685f5dde other 61de8c7723ca ancestor 000000000000 | |
125 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
125 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
126 | (branch merge, don't forget to commit) |
|
126 | (branch merge, don't forget to commit) | |
127 | changeset: 1:802f095af299 |
|
127 | changeset: 1:802f095af299 | |
128 | user: test |
|
128 | user: test | |
129 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
129 | date: Mon Jan 12 13:46:40 1970 +0000 | |
130 | summary: 2 |
|
130 | summary: 2 | |
131 |
|
131 | |||
132 | changeset: 2:030602aee63d |
|
132 | changeset: 2:030602aee63d | |
133 | tag: tip |
|
133 | tag: tip | |
134 | parent: 0:33aaa84a386b |
|
134 | parent: 0:33aaa84a386b | |
135 | user: test |
|
135 | user: test | |
136 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
136 | date: Mon Jan 12 13:46:40 1970 +0000 | |
137 | summary: 3 |
|
137 | summary: 3 | |
138 |
|
138 | |||
139 | diff -r 802f095af299 a |
|
139 | diff -r 802f095af299 a | |
140 | --- a/a |
|
140 | --- a/a | |
141 | +++ b/a |
|
141 | +++ b/a | |
142 | @@ -1,1 +1,1 @@ a2 |
|
142 | @@ -1,1 +1,1 @@ a2 | |
143 | -a2 |
|
143 | -a2 | |
144 | +abc |
|
144 | +abc | |
145 | adding a |
|
145 | adding a | |
146 | pulling from ../a |
|
146 | pulling from ../a | |
147 | requesting all changes |
|
147 | requesting all changes | |
148 | adding changesets |
|
148 | adding changesets | |
149 | adding manifests |
|
149 | adding manifests | |
150 | adding file changes |
|
150 | adding file changes | |
151 | added 1 changesets with 1 changes to 1 files |
|
151 | added 1 changesets with 1 changes to 1 files | |
152 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
152 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
@@ -1,54 +1,54 b'' | |||||
1 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
2 | Main should be gone |
|
2 | Main should be gone | |
3 | a |
|
3 | a | |
4 | changeset: 3:ded32b0db104 |
|
4 | changeset: 3:ded32b0db104 | |
5 | tag: tip |
|
5 | tag: tip | |
6 | user: test |
|
6 | user: test | |
7 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
7 | date: Mon Jan 12 13:46:40 1970 +0000 | |
8 | summary: Added side2 |
|
8 | summary: Added side2 | |
9 |
|
9 | |||
10 | changeset: 2:92a816cea698 |
|
10 | changeset: 2:92a816cea698 | |
11 | parent: 0:537353581d3d |
|
11 | parent: 0:537353581d3d | |
12 | user: test |
|
12 | user: test | |
13 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
13 | date: Mon Jan 12 13:46:40 1970 +0000 | |
14 | summary: Added side1 |
|
14 | summary: Added side1 | |
15 |
|
15 | |||
16 | changeset: 1:221226fb2bd8 |
|
16 | changeset: 1:221226fb2bd8 | |
17 | user: test |
|
17 | user: test | |
18 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
18 | date: Mon Jan 12 13:46:40 1970 +0000 | |
19 | summary: Added main |
|
19 | summary: Added main | |
20 |
|
20 | |||
21 | changeset: 0:537353581d3d |
|
21 | changeset: 0:537353581d3d | |
22 | user: test |
|
22 | user: test | |
23 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
23 | date: Mon Jan 12 13:46:40 1970 +0000 | |
24 | summary: Added a |
|
24 | summary: Added a | |
25 |
|
25 | |||
26 | Should have two heads, side2 and main |
|
26 | Should have two heads, side2 and main | |
27 | changeset: 3:ded32b0db104 |
|
27 | changeset: 3:ded32b0db104 | |
28 | tag: tip |
|
28 | tag: tip | |
29 | user: test |
|
29 | user: test | |
30 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
30 | date: Mon Jan 12 13:46:40 1970 +0000 | |
31 | summary: Added side2 |
|
31 | summary: Added side2 | |
32 |
|
32 | |||
33 | changeset: 1:221226fb2bd8 |
|
33 | changeset: 1:221226fb2bd8 | |
34 | user: test |
|
34 | user: test | |
35 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
35 | date: Mon Jan 12 13:46:40 1970 +0000 | |
36 | summary: Added main |
|
36 | summary: Added main | |
37 |
|
37 | |||
38 | Should show a side1 side2 |
|
38 | Should show a side1 side2 | |
39 | a |
|
39 | a | |
40 | side1 |
|
40 | side1 | |
41 | side2 |
|
41 | side2 | |
42 | resolving manifests |
|
42 | resolving manifests | |
43 |
force |
|
43 | force True allow False moddirstate True linear False | |
44 | ancestor 8515d4bfda76 local 1c0f48f8ece6 remote 0594b9004bae |
|
44 | ancestor 8515d4bfda76 local 1c0f48f8ece6 remote 0594b9004bae | |
45 | remote deleted side2, clobbering |
|
45 | remote deleted side2, clobbering | |
46 | remote deleted side1, clobbering |
|
46 | remote deleted side1, clobbering | |
47 | remote created main |
|
47 | remote created main | |
48 | getting main |
|
48 | getting main | |
49 | removing side1 |
|
49 | removing side1 | |
50 | removing side2 |
|
50 | removing side2 | |
51 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
51 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
52 | Should only show a main |
|
52 | Should only show a main | |
53 | a |
|
53 | a | |
54 | main |
|
54 | main |
General Comments 0
You need to be logged in to leave comments.
Login now