##// END OF EJS Templates
Merge with crew-stable
Patrick Mezard -
r6970:f7f0388f merge default
parent child Browse files
Show More
@@ -216,8 +216,9 b' def graphlog(ui, repo, path=None, **opts'
216 return
216 return
217 cs_printer = show_changeset(ui, repo, opts)
217 cs_printer = show_changeset(ui, repo, opts)
218 if path:
218 if path:
219 cpath = canonpath(repo.root, os.getcwd(), path)
219 path = canonpath(repo.root, os.getcwd(), path)
220 grapher = filelog_grapher(repo, cpath, start_rev, stop_rev)
220 if path:
221 grapher = filelog_grapher(repo, path, start_rev, stop_rev)
221 else:
222 else:
222 grapher = revision_grapher(repo, start_rev, stop_rev)
223 grapher = revision_grapher(repo, start_rev, stop_rev)
223 repo_parents = repo.dirstate.parents()
224 repo_parents = repo.dirstate.parents()
@@ -144,3 +144,10 b' hg glog 5'
144
144
145 echo % unused arguments
145 echo % unused arguments
146 hg glog -q foo bar || echo failed
146 hg glog -q foo bar || echo failed
147
148 echo % from outer space
149 cd ..
150 hg glog -l1 repo
151 hg glog -l1 repo/0
152 hg glog -l1 repo/missing
153
@@ -356,3 +356,16 b' hg glog [OPTION]... [FILE]'
356
356
357 show revision history alongside an ASCII revision graph
357 show revision history alongside an ASCII revision graph
358 failed
358 failed
359 % from outer space
360 @ changeset: 34:0eed7cd895e0
361 | tag: tip
362 | parent: 32:77f7d8438a3c
363 | user: test
364 | date: Thu Jan 01 00:00:34 1970 +0000
365 | summary: (34) head
366 |
367 o changeset: 0:7aa22e58e8c1
368 user: test
369 date: Thu Jan 01 00:00:00 1970 +0000
370 summary: (0) root
371
General Comments 0
You need to be logged in to leave comments. Login now