151 |
151 |
152 for n in p: |
152 for n in p: |
153 if n != hg.nullid: |
153 if n != hg.nullid: |
154 ui.write("%d:%s\n" % (repo.changelog.rev(n), hg.hex(n))) |
154 ui.write("%d:%s\n" % (repo.changelog.rev(n), hg.hex(n))) |
155 |
155 |
|
156 def resolve(ui, repo, node = None): |
|
157 '''merge a given node or the current tip into the working dir''' |
|
158 if not node: |
|
159 node = repo.changelog.tip() |
|
160 else: |
|
161 node = repo.lookup(node) |
|
162 repo.resolve(node) |
|
163 |
156 def status(ui, repo): |
164 def status(ui, repo): |
157 '''show changed files in the working directory |
165 '''show changed files in the working directory |
158 |
166 |
159 C = changed |
167 C = changed |
160 A = added |
168 A = added |
182 ('u', 'user', None, 'show user'), |
190 ('u', 'user', None, 'show user'), |
183 ('n', 'number', None, 'show revision number'), |
191 ('n', 'number', None, 'show revision number'), |
184 ('c', 'changeset', None, 'show changeset')], |
192 ('c', 'changeset', None, 'show changeset')], |
185 'hg annotate [-u] [-c] [-n] [-r id] [files]'), |
193 'hg annotate [-u] [-c] [-n] [-r id] [files]'), |
186 "parents": (parents, [], 'hg parents [node]'), |
194 "parents": (parents, [], 'hg parents [node]'), |
|
195 "resolve": (resolve, [], 'hg resolve [node]'), |
187 "status": (status, [], 'hg status'), |
196 "status": (status, [], 'hg status'), |
188 "undo": (undo, [], 'hg undo'), |
197 "undo": (undo, [], 'hg undo'), |
189 } |
198 } |
190 |
199 |
191 norepo = "init branch help" |
200 norepo = "init branch help" |