This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9341

log: add bookmark option to "hg log"
ClosedPublic

Authored by sebhtml on Nov 18 2020, 5:58 PM.

Download Raw Diff

Details

Reviewers

martinvonz

Group Reviewers

hg-reviewers

Commits

rHG0aa118f18d4b: log: add bookmark option to "hg log"

Summary

Before pushing a bookmark with "hg push origin -B 'my-topic'", it is useful to inspect
the list of commits that are ancestors of the bookmark.

By relying on scmutil.bookmarkrevs(), "hg log -B topic" has the same bookmark semantics
found in other commands like hg export, hg email, hg strip.

This is my V3.

Test Plan

[atlantis:/tank/home/sebhtml/projects/mercurial/sebhtml-hg-log-bookmark/hg-committed]
$ uname -a
FreeBSD atlantis 12.2-RELEASE FreeBSD 12.2-RELEASE r366954 GENERIC amd64

[atlantis:/tank/home/sebhtml/projects/mercurial/sebhtml-hg-log-bookmark/hg-committed]
$ ./tests/run-tests.py -t 600
running 946 tests using 12 parallel processes

Failed test-lfs-serve.t#lfsremote-on: output changed
Failed test-transaction-rollback-on-sigpipe.t: output changed

Ran 876 tests, 70 skipped, 2 failed.

python hash seed: 3187862483

test-lfs-serve.t

OUTPUT:--- /tank/home/sebhtml/projects/mercurial/sebhtml-hg-log-bookmark/hg-committed/tests/test-lfs-serve.t
OUTPUT:+++ /tank/home/sebhtml/projects/mercurial/sebhtml-hg-log-bookmark/hg-committed/tests/test-lfs-serve.t#lfsremote-on.err
OUTPUT:@@ -603,24 +603,26 @@
OUTPUT:   */hg-8374dc4052cb.patch (glob)
OUTPUT:   lfs: found bed80f00180ac404b843628ab56a1c1984d6145c391cd1628a7dd7d2598d71fc in the local lfs store
OUTPUT:   */hg-9640b57e77b1.patch (glob)
OUTPUT:-  --- */hg-8374dc4052cb.patch  * (glob)
OUTPUT:-  +++ */hg-9640b57e77b1.patch  * (glob)
OUTPUT:-  @@ -2,12 +2,7 @@
OUTPUT:-   # User test
OUTPUT:-   # Date 0 0
OUTPUT:-   #      Thu Jan 01 00:00:00 1970 +0000
OUTPUT:-  -# Node ID 8374dc4052cbd388e79d9dc4ddb29784097aa354
OUTPUT:-  -# Parent  1477875038c60152e391238920a16381c627b487
OUTPUT:-  -lfs
OUTPUT:-  +# Node ID 9640b57e77b14c3a0144fb4478b6cc13e13ea0d1
OUTPUT:-  +# Parent  d3b84d50eacbd56638e11abce6b8616aaba54420
OUTPUT:-  +add lfs pair
OUTPUT:-
OUTPUT:-  -diff -r 1477875038c6 -r 8374dc4052cb lfs.bin
OUTPUT:-  ---- /dev/null       Thu Jan 01 00:00:00 1970 +0000
OUTPUT:-  -+++ b/lfs.bin       Thu Jan 01 00:00:00 1970 +0000
OUTPUT:-  -@@ -0,0 +1,1 @@
OUTPUT:-  -+this is a big lfs file
OUTPUT:+  error: conflicting output format options.
OUTPUT:+  usage: diff [-aBbdilpTtw] [-c | -e | -f | -n | -q | -u] [--ignore-case]
OUTPUT:+              [--no-ignore-case] [--normal] [--strip-trailing-cr] [--tabsize]
OUTPUT:+              [-I pattern] [-L label] file1 file2
OUTPUT:+         diff [-aBbdilpTtw] [-I pattern] [-L label] [--ignore-case]
OUTPUT:+              [--no-ignore-case] [--normal] [--strip-trailing-cr] [--tabsize]
OUTPUT:+              -C number file1 file2
OUTPUT:+              [--no-ignore-case] [--normal] [--strip-trailing-cr] [--tabsize]                                                                                [120/1886]
OUTPUT:+              -C number file1 file2
OUTPUT:+         diff [-aBbdiltw] [-I pattern] [--ignore-case] [--no-ignore-case]
OUTPUT:+              [--normal] [--strip-trailing-cr] [--tabsize] -D string file1 file2
OUTPUT:+         diff [-aBbdilpTtw] [-I pattern] [-L label] [--ignore-case]
OUTPUT:+              [--no-ignore-case] [--normal] [--tabsize] [--strip-trailing-cr]
OUTPUT:+              -U number file1 file2
OUTPUT:+         diff [-aBbdilNPprsTtw] [-c | -e | -f | -n | -q | -u] [--ignore-case]
OUTPUT:+              [--no-ignore-case] [--normal] [--tabsize] [-I pattern] [-L label]
OUTPUT:+              [-S name] [-X file] [-x pattern] dir1 dir2
OUTPUT:+         diff [-aBbditwW] [--expand-tabs] [--ignore-all-blanks]
OUTPUT:+              [--ignore-blank-lines] [--ignore-case] [--minimal]
OUTPUT:+              [--no-ignore-file-name-case] [--strip-trailing-cr]
OUTPUT:+              [--suppress-common-lines] [--tabsize] [--text] [--width]
OUTPUT:+              -y | --side-by-side file1 file2
OUTPUT:   cleaning up temp directory
OUTPUT:   [1]
OUTPUT:
OUTPUT:
OUTPUT:ERROR: test-lfs-serve.t#lfsremote-on output changed
OUTPUT:

test-transaction-rollback-on-sigpipe.t

OUTPUT:--- /tank/home/sebhtml/projects/mercurial/sebhtml-hg-log-bookmark/hg-committed/tests/test-transaction-rollback-on-sigpipe.t
OUTPUT:+++ /tank/home/sebhtml/projects/mercurial/sebhtml-hg-log-bookmark/hg-committed/tests/test-transaction-rollback-on-sigpipe.t.err
OUTPUT:@@ -56,7 +56,8 @@
OUTPUT:   $ cd local
OUTPUT:   $ echo foo > foo ; hg commit -qAm "commit"
OUTPUT:   $ hg push -q -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" --remotecmd $remotecmd 2>&1 | grep -v $killable_pipe
OUTPUT:-  abort: stream ended unexpectedly (got 0 bytes, expected 4)
OUTPUT:+  remote: sh: $TESTTMP/remotecmd.sh: not found
OUTPUT:+  abort: no suitable response from remote hg!
OUTPUT:
OUTPUT:   $ check_for_abandoned_transaction
OUTPUT:   [1]
OUTPUT:
OUTPUT:ERROR: test-transaction-rollback-on-sigpipe.t output changed
OUTPUT:
OUTPUT:

Diff Detail

Repository

rHG Mercurial

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

sebhtml created this revision.Nov 18 2020, 5:58 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptNov 18 2020, 5:58 PM

Herald added a subscriber: mercurial-patches. · View Herald Transcript

sebhtml edited the test plan for this revision. (Show Details)Nov 18 2020, 6:07 PM

sebhtml added a reviewer: martinvonz.

sebhtml mentioned this in D9316: log: add argument -B/--bookmark for bookmarks.Nov 18 2020, 6:10 PM

sebhtml edited the summary of this revision. (Show Details)Nov 18 2020, 6:15 PM

Do test-lfs-serve.t and test-transaction-rollback-on-sigpipe.t consistently fail with this patch? If they do, you should fix them :) If they don't (i.e. it was some flakiness you were experiencing), just don't mention that in the commit message and instead ask on #mercurial or send an email to mercurial-devel to see if others have seen the flakiness and ask how to fix it.

In D9341#140899, @martinvonz wrote:

Do test-lfs-serve.t and test-transaction-rollback-on-sigpipe.t consistently fail with this patch? If they do, you should fix them :) If they don't (i.e. it was some flakiness you were experiencing), just don't mention that in the commit message and instead ask on #mercurial or send an email to mercurial-devel to see if others have seen the flakiness and ask how to fix it.

Also, including diff output (such as from failing tests) without indentation makes the patch fail to apply:

$ hg phabimport D9341
applying patch from D9341
unable to find 'tank/home/sebhtml/projects/mercurial/sebhtml-hg-log-bookmark/hg-committed/tests/test-lfs-serve.t' for patching
(use '--prefix' to apply patch relative to the current directory)
abort: bad hunk #1 @@ -603,24 +603,26 @@
 (24 24 28 26)

In D9341#140899, @martinvonz wrote:

Do test-lfs-serve.t and test-transaction-rollback-on-sigpipe.t consistently fail with this patch? If they do, you should fix them :) If they don't (i.e. it was some flakiness you were experiencing), just don't mention that in the commit message and instead ask on #mercurial or send an email to mercurial-devel to see if others have seen the flakiness and ask how to fix it.

I think that these two tests fail because they are not portable on FreeBSD.
I will run them on 'default' on FreeBSD and on 'default' on Debian Linux and post results here.

Also, including diff output (such as from failing tests) without indentation makes the patch fail to apply:
unable to find 'tank/home/sebhtml/projects/mercurial/sebhtml-hg-log-bookmark/hg-committed/tests/test-lfs-serve.t' for patching

I think that the problem is that "hg phabimport" is fetching what I wrote in the test plan. I did not commit anything to tests/test-lfs-serve.t
This is weird.

In D9341#140944, @sebhtml wrote:

Also, including diff output (such as from failing tests) without indentation makes the patch fail to apply:
unable to find 'tank/home/sebhtml/projects/mercurial/sebhtml-hg-log-bookmark/hg-committed/tests/test-lfs-serve.t' for patching

I think that the problem is that "hg phabimport" is fetching what I wrote in the test plan. I did not commit anything to tests/test-lfs-serve.t
This is weird.

That's what I meant: you need to indent diffs that you include in the commit message, otherwise tools can't figure out where the commit message ends and the diff starts. But I still think you can just remove that whole thing from the commit message; it's implied that the test plan is to run the test suite, so you only need to describe your test plan if you did some other testing and/or did not run the test suite.

That's what I meant: you need to indent diffs that you include in the commit message, otherwise tools can't figure out where the commit message ends and the diff starts. But I still think you can just remove that whole thing from the commit message; it's implied that the test plan is to run the test suite, so you only need to describe your test plan if you did some other testing and/or did not run the test suite.

I did not include any diff in my commit message, as far as I know.

Given what you recommended, I added the prefix OUTPUT: in my test results in my test plan.

In D9341#140969, @sebhtml wrote:

That's what I meant: you need to indent diffs that you include in the commit message, otherwise tools can't figure out where the commit message ends and the diff starts. But I still think you can just remove that whole thing from the commit message; it's implied that the test plan is to run the test suite, so you only need to describe your test plan if you did some other testing and/or did not run the test suite.

I did not include any diff in my commit message, as far as I know.
Given what you recommended, I added the prefix OUTPUT: in my test results in my test plan.

The test failure has a diff. I still think that's just noise that will confuse much more than it helps. Okay if I drop the test plan from the commit message in flight?

The test failure has a diff. I still think that's just noise that will confuse much more than it helps. Okay if I drop the test plan from the commit message in flight?

Sure. In my opinion, the test plan is not part of my commit message.

I am currently running the tests in a VM-BHYVE running Debian Linux 10. I except all tests to pass.
I will keep you posted.

In D9341#140972, @sebhtml wrote:

The test failure has a diff. I still think that's just noise that will confuse much more than it helps. Okay if I drop the test plan from the commit message in flight?

Sure. In my opinion, the test plan is not part of my commit message.
I am currently running the tests in a VM-BHYVE running Debian Linux 10. I except all tests to pass.
I will keep you posted.

I've run the tests on whatever kind of Debian I have and only test-check-format.t failed. I'll fix the formatting error in flight. Queuing this now, thanks!

This revision is now accepted and ready to land.Nov 23 2020, 6:47 PM

sebhtml added a commit: rHG0aa118f18d4b: log: add bookmark option to "hg log".Nov 23 2020, 6:51 PM

Closed by commit rHG0aa118f18d4b: log: add bookmark option to "hg log" (authored by sebhtml). · Explain Why

This revision was automatically updated to reflect the committed changes.

In D9341#140899, @martinvonz wrote:

Do test-lfs-serve.t and test-transaction-rollback-on-sigpipe.t consistently fail with this patch? If they do, you should fix them :) If they don't (i.e. it was some flakiness you were experiencing), just don't mention that in the commit message and instead ask on #mercurial or send an email to mercurial-devel to see if others have seen the flakiness and ask how to fix it.

I think that the problem is that the 2 failing tests of Mercurial are not portable on FreeBSD 12.2.

Proof:

Tests in 'default' on Debian GNU/Linux 10 (buster)

$ uname -a
Linux capside 4.19.0-12-amd64 #1 SMP Debian 4.19.152-1 (2020-10-18) x86_64 GNU/Linux

$ python --version
Python 3.7.3

$ hg id
f96059fa519c tip @

$ ./tests/run-tests.py -t 600
running 945 tests using 12 parallel processes
...
# Ran 870 tests, 75 skipped, 0 failed.

$ ./tests/run-tests.py -t 600 tests/test-lfs-serve.t                                                         
running 2 tests using 2 parallel processes 
..
# Ran 2 tests, 0 skipped, 0 failed.

$ ./tests/run-tests.py -t 600 tests/test-transaction-rollback-on-sigpipe.t
running 1 tests using 1 parallel processes 
.
# Ran 1 tests, 0 skipped, 0 failed.

Tests in 'default' on FreeBSD 12.2

$ uname -a
FreeBSD atlantis 12.2-RELEASE FreeBSD 12.2-RELEASE r366954 GENERIC  amd64

$ python --version
Python 3.7.6

$ pwd
/tank/home/sebhtml/projects/mercurial/mercurial-scm.org/hg-committed

$ hg id
f96059fa519c tip @

$ ./tests/run-tests.py -t 600
running 945 tests using 12 parallel processes                  
...
Failed test-lfs-serve.t#lfsremote-on: output changed
Failed test-transaction-rollback-on-sigpipe.t: output changed
# Ran 875 tests, 70 skipped, 2 failed.
python hash seed: 864460952

In D9341#141016, @sebhtml wrote:

In D9341#140899, @martinvonz wrote:

Do test-lfs-serve.t and test-transaction-rollback-on-sigpipe.t consistently fail with this patch? If they do, you should fix them :) If they don't (i.e. it was some flakiness you were experiencing), just don't mention that in the commit message and instead ask on #mercurial or send an email to mercurial-devel to see if others have seen the flakiness and ask how to fix it.

I think that the problem is that the 2 failing tests of Mercurial are not portable on FreeBSD 12.2.

I don't have FreeBSD so it's hard for me to test. We're happy to take patches for making the tests more portable :)

pulkit mentioned this in D9317: log: use scmutil.bookmarkrevs to get the revisions of a bookmark.Dec 4 2020, 2:30 PM

pulkit mentioned this in D9315: test: test 'hg log' using a bookmark.

Revision Contents
Changeset List

		Path
M		mercurial/commands.py (18 lines)
M		mercurial/logcmdutil.py (20 lines)
M		tests/test-completion.t (2 lines)
A	M	tests/test-log-bookmark.t (127 lines)

Diff 23640

mercurial/commands.py

	(			(
	b'b',			b'b',
	b'branch',			b'branch',
	[],			[],
	_(b'show changesets within the given named branch'),			_(b'show changesets within the given named branch'),
	_(b'BRANCH'),			_(b'BRANCH'),
	),			),
	(			(
				b'B',
				b'bookmark',
				[],
				_(b"show changesets within the given bookmark"),
				_(b'BOOKMARK'),
				),
				(
	b'P',			b'P',
	b'prune',			b'prune',
	[],			[],
	_(b'do not display revision or any of its ancestors'),			_(b'do not display revision or any of its ancestors'),
	_(b'REV'),			_(b'REV'),
	),			),
	]			]
	+ logopts			+ logopts

	if linerange and pats:			if linerange and pats:
	# TODO: take pats as patterns with no line-range filter			# TODO: take pats as patterns with no line-range filter
	raise error.InputError(			raise error.InputError(
	_(b'FILE arguments are not compatible with --line-range option')			_(b'FILE arguments are not compatible with --line-range option')
	)			)

	repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn')			repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn')
	revs, differ = logcmdutil.getrevs(			walk_opts = logcmdutil.parseopts(ui, pats, opts)
	repo, logcmdutil.parseopts(ui, pats, opts)			revs, differ = logcmdutil.getrevs(repo, walk_opts)
	)
	if linerange:			if linerange:
	# TODO: should follow file history from logcmdutil._initialrevs(),			# TODO: should follow file history from logcmdutil._initialrevs(),
	# then filter the result by logcmdutil._makerevset() and --limit			# then filter the result by logcmdutil._makerevset() and --limit
	revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)			revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)

				if opts.get(b'bookmark'):
				cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark')
				bookmarks = opts.get(b'bookmark')
				bookmark = bookmarks[0]
				revs, differ = logcmdutil.get_bookmark_revs(repo, bookmark, walk_opts)

	getcopies = None			getcopies = None
	if opts.get(b'copies'):			if opts.get(b'copies'):
	endrev = None			endrev = None
	if revs:			if revs:
	endrev = revs.max() + 1			endrev = revs.max() + 1
	getcopies = scmutil.getcopiesfn(repo, endrev=endrev)			getcopies = scmutil.getcopiesfn(repo, endrev=endrev)

	ui.pager(b'log')			ui.pager(b'log')

mercurial/logcmdutil.py

	revs, filematcher = makewalker(repo, wopts)			revs, filematcher = makewalker(repo, wopts)
	if not revs:			if not revs:
	return revs, None			return revs, None
	differ = changesetdiffer()			differ = changesetdiffer()
	differ._makefilematcher = filematcher			differ._makefilematcher = filematcher
	return revs, differ			return revs, differ


				def get_bookmark_revs(repo, bookmark, walk_opts):
				# type: (Any, bookmark, walk_opts) -> Tuple[smartset.abstractsmartset, Optional[changesetdiffer]]
				"""Return (revs, differ) where revs is a smartset

				differ is a changesetdiffer with pre-configured file matcher.
				"""
				revs, filematcher = makewalker(repo, walk_opts)
				if not revs:
				return revs, None
				differ = changesetdiffer()
				differ._makefilematcher = filematcher

				if bookmark:
				if bookmark not in repo._bookmarks:
				raise error.Abort(_(b"bookmark '%s' not found") % bookmark)
				revs = scmutil.bookmarkrevs(repo, bookmark)

				return revs, differ


	def _parselinerangeopt(repo, opts):			def _parselinerangeopt(repo, opts):
	"""Parse --line-range log option and return a list of tuples (filename,			"""Parse --line-range log option and return a list of tuples (filename,
	(fromline, toline)).			(fromline, toline)).
	"""			"""
	linerangebyfname = []			linerangebyfname = []
	for pat in opts.get(b'line_range', []):			for pat in opts.get(b'line_range', []):
	try:			try:
	pat, linerange = pat.rsplit(b',', 1)			pat, linerange = pat.rsplit(b',', 1)

tests/test-completion.t

	grep: print0, all, diff, text, follow, ignore-case, files-with-matches, line-number, rev, all-files, user, date, template, include, exclude			grep: print0, all, diff, text, follow, ignore-case, files-with-matches, line-number, rev, all-files, user, date, template, include, exclude
	heads: rev, topo, active, closed, style, template			heads: rev, topo, active, closed, style, template
	help: extension, command, keyword, system			help: extension, command, keyword, system
	identify: rev, num, id, branch, tags, bookmarks, ssh, remotecmd, insecure, template			identify: rev, num, id, branch, tags, bookmarks, ssh, remotecmd, insecure, template
	import: strip, base, secret, edit, force, no-commit, bypass, partial, exact, prefix, import-branch, message, logfile, date, user, similarity			import: strip, base, secret, edit, force, no-commit, bypass, partial, exact, prefix, import-branch, message, logfile, date, user, similarity
	incoming: force, newest-first, bundle, rev, bookmarks, branch, patch, git, limit, no-merges, stat, graph, style, template, ssh, remotecmd, insecure, subrepos			incoming: force, newest-first, bundle, rev, bookmarks, branch, patch, git, limit, no-merges, stat, graph, style, template, ssh, remotecmd, insecure, subrepos
	init: ssh, remotecmd, insecure			init: ssh, remotecmd, insecure
	locate: rev, print0, fullpath, include, exclude			locate: rev, print0, fullpath, include, exclude
	log: follow, follow-first, date, copies, keyword, rev, line-range, removed, only-merges, user, only-branch, branch, prune, patch, git, limit, no-merges, stat, graph, style, template, include, exclude			log: follow, follow-first, date, copies, keyword, rev, line-range, removed, only-merges, user, only-branch, branch, bookmark, prune, patch, git, limit, no-merges, stat, graph, style, template, include, exclude
	manifest: rev, all, template			manifest: rev, all, template
	merge: force, rev, preview, abort, tool			merge: force, rev, preview, abort, tool
	outgoing: force, rev, newest-first, bookmarks, branch, patch, git, limit, no-merges, stat, graph, style, template, ssh, remotecmd, insecure, subrepos			outgoing: force, rev, newest-first, bookmarks, branch, patch, git, limit, no-merges, stat, graph, style, template, ssh, remotecmd, insecure, subrepos
	parents: rev, style, template			parents: rev, style, template
	paths: template			paths: template
	phase: public, draft, secret, force, rev			phase: public, draft, secret, force, rev
	pull: update, force, confirm, rev, bookmark, branch, ssh, remotecmd, insecure			pull: update, force, confirm, rev, bookmark, branch, ssh, remotecmd, insecure
	push: force, rev, bookmark, all-bookmarks, branch, new-branch, pushvars, publish, ssh, remotecmd, insecure			push: force, rev, bookmark, all-bookmarks, branch, new-branch, pushvars, publish, ssh, remotecmd, insecure

tests/test-log-bookmark.t

This file was added.

				Test 'hg log' with a bookmark


				Create the repository

				$ hg init Test-D8973
				$ cd Test-D8973
				$ echo "bar" > foo.txt
				$ hg add foo.txt
				$ hg commit -m "Add foo in 'default'"


				Add a bookmark for topic X

				$ hg branch -f sebhtml
				marked working directory as branch sebhtml
				(branches are permanent and global, did you want a bookmark?)

				$ hg bookmark sebhtml/99991-topic-X
				$ hg up sebhtml/99991-topic-X
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ echo "X" > x.txt
				$ hg add x.txt
				$ hg commit -m "Add x.txt in 'sebhtml/99991-topic-X'"

				$ hg log -B sebhtml/99991-topic-X
				changeset: 1:29f39dea9bf9
				branch: sebhtml
				bookmark: sebhtml/99991-topic-X
				tag: tip
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: Add x.txt in 'sebhtml/99991-topic-X'


				Add a bookmark for topic Y

				$ hg update default
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				(leaving bookmark sebhtml/99991-topic-X)

				$ echo "Y" > y.txt
				$ hg add y.txt
				$ hg branch -f sebhtml
				marked working directory as branch sebhtml
				$ hg bookmark sebhtml/99992-topic-Y
				$ hg up sebhtml/99992-topic-Y
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg commit -m "Add y.txt in 'sebhtml/99992-topic-Y'"
				created new head

				$ hg log -B sebhtml/99992-topic-Y
				changeset: 2:11df7969cf8d
				branch: sebhtml
				bookmark: sebhtml/99992-topic-Y
				tag: tip
				parent: 0:eaea25376a59
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: Add y.txt in 'sebhtml/99992-topic-Y'


				The log of topic Y does not interfere with the log of topic X

				$ hg log -B sebhtml/99991-topic-X
				changeset: 1:29f39dea9bf9
				branch: sebhtml
				bookmark: sebhtml/99991-topic-X
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: Add x.txt in 'sebhtml/99991-topic-X'


				Merge topics Y and X in the default branch

				$ hg update default
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				(leaving bookmark sebhtml/99992-topic-Y)

				$ hg bookmark
				sebhtml/99991-topic-X 1:29f39dea9bf9
				sebhtml/99992-topic-Y 2:11df7969cf8d

				$ hg merge sebhtml/99992-topic-Y
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)

				$ hg commit -m "Merge branch 'sebhtml/99992-topic-Y' into 'default'"

				$ hg update default
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ hg merge sebhtml/99991-topic-X
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)

				$ hg commit -m "Merge branch 'sebhtml/99991-topic-X' into 'default'"


				Check the log of topic X, topic Y, and default branch

				$ hg log -B sebhtml/99992-topic-Y

				$ hg log -B sebhtml/99991-topic-X

				$ hg log -b default
				changeset: 4:c26ba8c1e1cb
				tag: tip
				parent: 3:2189f3fb90d6
				parent: 1:29f39dea9bf9
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: Merge branch 'sebhtml/99991-topic-X' into 'default'

				changeset: 3:2189f3fb90d6
				parent: 0:eaea25376a59
				parent: 2:11df7969cf8d
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: Merge branch 'sebhtml/99992-topic-Y' into 'default'

				changeset: 0:eaea25376a59
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: Add foo in 'default'

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	23538		Nov 18 2020, 5:58 PM	★	★
Diff 2	23640	rHG0aa118f18d4bfc17a4e03656bb72243faa0e8012	Nov 17 2020, 9:30 PM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

log: add bookmark option to "hg log"ClosedPublic

Details

Ran 876 tests, 70 skipped, 2 failed.

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 23640

mercurial/commands.py

mercurial/logcmdutil.py

tests/test-completion.t

tests/test-log-bookmark.t

log: add bookmark option to "hg log"
ClosedPublic

Revision Contents
Changeset List