Summary

Add Mercurial support to rbt land

Review Request #9744 — Created March 5, 2018 and discarded Aug. 18, 2020, 11:38 a.m.

Information

Owner

maram

Repository

RBTools

Branch

release-0.7.x

Bugs

Depends On

Reviewers

Groups

rbtools, students

People

Description

rbt land supports Git, this change adds support for Mercurial as well.
rbt land works on bookmarks in mercurial.
Mercurial supports merging and deleting bookmarks but not pushing upstream because
bookmarks are usually not shared with the upstream, so it is left to the user to
decide what they push.

Testing Done

Ran all unit tests
Added unit tests for the new mercurial client functions.
Tested some rbt land commands on a Mercurial repository including --local,
not local, --squash, and --no-squash.

Issues

Description	From	Last Updated
F401 'rbtools.clients.errors.PushError' imported but unused	reviewbot	April 4, 2018, 10:01 p.m.
E303 too many blank lines (2)	reviewbot	April 4, 2018, 10:02 p.m.
E261 at least two spaces before inline comment	reviewbot	April 4, 2018, 10:02 p.m.
W391 blank line at end of file	reviewbot	April 4, 2018, 10:02 p.m.
F401 'rbtools.clients.errors.PushError' imported but unused	reviewbot	March 11, 2018, 3:08 a.m.
E231 missing whitespace after ','	reviewbot	March 11, 2018, 3:08 a.m.
E501 line too long (80 > 79 characters)	reviewbot	March 11, 2018, 3:08 a.m.
E501 line too long (88 > 79 characters)	reviewbot	March 11, 2018, 3:08 a.m.
E501 line too long (91 > 79 characters)	reviewbot	March 11, 2018, 3:08 a.m.
E231 missing whitespace after ','	reviewbot	March 11, 2018, 3:08 a.m.
E501 line too long (82 > 79 characters)	reviewbot	March 11, 2018, 3:08 a.m.
W391 blank line at end of file	reviewbot	March 11, 2018, 3:08 a.m.
F401 'rbtools.clients.errors.PushError' imported but unused	reviewbot	April 4, 2018, 10:03 p.m.
F821 undefined name 'bookmark'	reviewbot	April 4, 2018, 10:03 p.m.
E231 missing whitespace after ','	reviewbot	April 4, 2018, 10:04 p.m.
F821 undefined name 'branch'	reviewbot	April 4, 2018, 10:04 p.m.
E501 line too long (81 > 79 characters)	reviewbot	April 4, 2018, 10:04 p.m.
E303 too many blank lines (2)	reviewbot	April 4, 2018, 10:04 p.m.
E231 missing whitespace after ','	reviewbot	April 4, 2018, 10:04 p.m.
E501 line too long (80 > 79 characters)	reviewbot	April 4, 2018, 10:04 p.m.
E501 line too long (88 > 79 characters)	reviewbot	April 4, 2018, 10:05 p.m.
E501 line too long (91 > 79 characters)	reviewbot	April 4, 2018, 10:05 p.m.
E231 missing whitespace after ','	reviewbot	April 4, 2018, 10:05 p.m.
E501 line too long (82 > 79 characters)	reviewbot	April 4, 2018, 10:05 p.m.
E265 block comment should start with '# '	reviewbot	April 4, 2018, 10:05 p.m.
W391 blank line at end of file	reviewbot	April 4, 2018, 10:05 p.m.
E128 continuation line under-indented for visual indent	reviewbot	April 4, 2018, 10:05 p.m.
E128 continuation line under-indented for visual indent	reviewbot	April 4, 2018, 10:05 p.m.
E231 missing whitespace after ','	reviewbot	April 4, 2018, 10:05 p.m.
E303 too many blank lines (2)	reviewbot	April 4, 2018, 10:05 p.m.
E231 missing whitespace after ','	reviewbot	April 4, 2018, 10:05 p.m.
E231 missing whitespace after ','	reviewbot	April 4, 2018, 10:05 p.m.
E501 line too long (80 > 79 characters)	reviewbot	April 4, 2018, 10:05 p.m.
E501 line too long (86 > 79 characters)	reviewbot	April 4, 2018, 10:05 p.m.
E128 continuation line under-indented for visual indent	reviewbot	April 4, 2018, 10:05 p.m.
W391 blank line at end of file	reviewbot	April 4, 2018, 10:05 p.m.
E501 line too long (88 > 79 characters)	reviewbot	April 4, 2018, 10:05 p.m.
E265 block comment should start with '# '	reviewbot	April 4, 2018, 10:05 p.m.
E501 line too long (85 > 79 characters)	reviewbot	April 4, 2018, 10:05 p.m.
E501 line too long (86 > 79 characters)	reviewbot	April 4, 2018, 10:06 p.m.
F401 'rbtools.commands.CommandError' imported but unused	reviewbot	April 4, 2018, 10:06 p.m.
E303 too many blank lines (3)	reviewbot	April 4, 2018, 10:06 p.m.
E231 missing whitespace after ','	reviewbot	April 4, 2018, 10:06 p.m.
E303 too many blank lines (2)	reviewbot	April 4, 2018, 10:06 p.m.
F401 'rbtools.clients.errors.PushError' imported but unused	reviewbot	April 4, 2018, 10:14 p.m.
E128 continuation line under-indented for visual indent	reviewbot	April 4, 2018, 10:14 p.m.
E128 continuation line under-indented for visual indent	reviewbot	April 4, 2018, 10:15 p.m.
E128 continuation line under-indented for visual indent	reviewbot	April 4, 2018, 10:16 p.m.
E128 continuation line under-indented for visual indent	reviewbot	April 4, 2018, 10:16 p.m.
E127 continuation line over-indented for visual indent	reviewbot	April 4, 2018, 10:16 p.m.
E127 continuation line over-indented for visual indent	reviewbot	April 4, 2018, 10:16 p.m.
E231 missing whitespace after ','	reviewbot	April 4, 2018, 10:17 p.m.
E231 missing whitespace after ','	reviewbot	April 4, 2018, 10:17 p.m.
E501 line too long (83 > 79 characters)	reviewbot	April 4, 2018, 10:18 p.m.
E128 continuation line under-indented for visual indent	reviewbot	April 4, 2018, 10:18 p.m.
E303 too many blank lines (2)	reviewbot	April 4, 2018, 10:18 p.m.
E231 missing whitespace after ','	reviewbot	April 4, 2018, 10:19 p.m.
E128 continuation line under-indented for visual indent	reviewbot	April 4, 2018, 10:20 p.m.
E128 continuation line under-indented for visual indent	reviewbot	April 4, 2018, 10:20 p.m.
E128 continuation line under-indented for visual indent	reviewbot	April 4, 2018, 10:20 p.m.
E128 continuation line under-indented for visual indent	reviewbot	April 4, 2018, 10:20 p.m.
E128 continuation line under-indented for visual indent	reviewbot	April 4, 2018, 10:20 p.m.
E128 continuation line under-indented for visual indent	reviewbot	April 4, 2018, 10:20 p.m.
E128 continuation line under-indented for visual indent	reviewbot	April 4, 2018, 10:20 p.m.
E128 continuation line under-indented for visual indent	reviewbot	April 4, 2018, 10:20 p.m.
E128 continuation line under-indented for visual indent	reviewbot	April 4, 2018, 10:20 p.m.
E128 continuation line under-indented for visual indent	reviewbot	April 4, 2018, 10:20 p.m.
E128 continuation line under-indented for visual indent	reviewbot	April 4, 2018, 10:20 p.m.
E231 missing whitespace after ','	reviewbot	April 4, 2018, 10:20 p.m.
E231 missing whitespace after ','	reviewbot	April 4, 2018, 10:29 p.m.
E303 too many blank lines (2)	reviewbot	April 4, 2018, 10:29 p.m.
E303 too many blank lines (3)	reviewbot	April 4, 2018, 10:29 p.m.
E501 line too long (88 > 79 characters)	reviewbot	April 4, 2018, 10:22 p.m.
E265 block comment should start with '# '	reviewbot	April 4, 2018, 10:32 p.m.
W503 line break before binary operator	reviewbot	April 4, 2018, 10:39 p.m.
W293 blank line contains whitespace	reviewbot	April 4, 2018, 10:39 p.m.
E501 line too long (80 > 79 characters)	reviewbot	April 4, 2018, 10:39 p.m.
E501 line too long (81 > 79 characters)	reviewbot	April 4, 2018, 10:39 p.m.
W503 line break before binary operator	reviewbot	April 4, 2018, 10:42 p.m.

flake8 failed.

JSHint passed.

flake8

rbtools/clients/mercurial.py (Diff revision 1)
The issue has been resolved. Show all issues
```
F401 'rbtools.clients.errors.PushError' imported but unused
```
rbtools/clients/mercurial.py (Diff revision 1)
The issue has been resolved. Show all issues
```
E303 too many blank lines (2)
```
rbtools/clients/mercurial.py (Diff revision 1)
The issue has been resolved. Show all issues
```
E261 at least two spaces before inline comment
```
rbtools/clients/mercurial.py (Diff revision 1)
The issue has been resolved. Show all issues
```
W391 blank line at end of file
```

Summary:: Add basic merge in mercurialClient to support land
[WIP] Add Mercurial support to rbt land
Description:: ~
[WIP] Add Mercurial support to rbt land
~
rbt land supports Git, this change adds support for Mercurial as well.

Testing Done:

		Currently,the following commands work on a Mercurial repository:
~		rbt land -r ## --local --no-delete-branch
	~	rbt land -r ## --local --no-delete-branch --no-squash

Commit:

c48cdf890d5668f1faad40d128feff4af30bd020

9ee1a21fe3b8ce731c35cb53a91be2b12c1fe75f

Diff:

Revision 2 (+64 -3)

Show changes

rbtools/clients/mercurial.py

Checks run (1 failed, 1 succeeded)

flake8 failed.

JSHint passed.

flake8

rbtools/clients/mercurial.py (Diff revision 2)
The issue has been dropped. Show all issues
```
F401 'rbtools.clients.errors.PushError' imported but unused
```
rbtools/clients/mercurial.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E231 missing whitespace after ','
```
rbtools/clients/mercurial.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E501 line too long (80 > 79 characters)
```
rbtools/clients/mercurial.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E501 line too long (88 > 79 characters)
```
rbtools/clients/mercurial.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E501 line too long (91 > 79 characters)
```
rbtools/clients/mercurial.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E231 missing whitespace after ','
```
rbtools/clients/mercurial.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E501 line too long (82 > 79 characters)
```
rbtools/clients/mercurial.py (Diff revision 2)
The issue has been dropped. Show all issues
```
W391 blank line at end of file
```

Change Summary:

Identifying fifferences between git and hg

Commit:

9ee1a21fe3b8ce731c35cb53a91be2b12c1fe75f

e81164482e770ebe0a75c2c7d1ef26aa3b2dbecd

Diff:

Revision 3 (+75 -3)

Show changes

rbtools/clients/mercurial.py

Checks run (1 failed, 1 succeeded)

flake8 failed.

JSHint passed.

flake8

rbtools/clients/mercurial.py (Diff revision 3)
The issue has been resolved. Show all issues
```
F401 'rbtools.clients.errors.PushError' imported but unused
```
rbtools/clients/mercurial.py (Diff revision 3)
The issue has been resolved. Show all issues
```
F821 undefined name 'bookmark'
```
rbtools/clients/mercurial.py (Diff revision 3)
The issue has been resolved. Show all issues
```
E231 missing whitespace after ','
```
rbtools/clients/mercurial.py (Diff revision 3)
The issue has been resolved. Show all issues
```
F821 undefined name 'branch'
```
rbtools/clients/mercurial.py (Diff revision 3)
The issue has been resolved. Show all issues
```
E501 line too long (81 > 79 characters)
```
rbtools/clients/mercurial.py (Diff revision 3)
The issue has been resolved. Show all issues
```
E303 too many blank lines (2)
```
rbtools/clients/mercurial.py (Diff revision 3)
The issue has been resolved. Show all issues
```
E231 missing whitespace after ','
```
rbtools/clients/mercurial.py (Diff revision 3)
The issue has been resolved. Show all issues
```
E501 line too long (80 > 79 characters)
```
rbtools/clients/mercurial.py (Diff revision 3)
The issue has been resolved. Show all issues
```
E501 line too long (88 > 79 characters)
```
rbtools/clients/mercurial.py (Diff revision 3)
The issue has been resolved. Show all issues
```
E501 line too long (91 > 79 characters)
```
rbtools/clients/mercurial.py (Diff revision 3)
The issue has been resolved. Show all issues
```
E231 missing whitespace after ','
```
rbtools/clients/mercurial.py (Diff revision 3)
The issue has been resolved. Show all issues
```
E501 line too long (82 > 79 characters)
```
rbtools/clients/mercurial.py (Diff revision 3)
The issue has been resolved. Show all issues
```
E265 block comment should start with '# '
```
rbtools/clients/mercurial.py (Diff revision 3)
The issue has been resolved. Show all issues
```
W391 blank line at end of file
```

Commit:

e81164482e770ebe0a75c2c7d1ef26aa3b2dbecd

49918777cca22250a5ec849de7f877eca783fbb3

Diff:

Revision 4 (+173 -6)

Show changes

	rbtools/clients/mercurial.py
	rbtools/commands/land.py
	rbtools/commands/tests/test_land.py

Checks run (1 failed, 1 succeeded)

flake8 failed.

JSHint passed.

flake8

rbtools/clients/mercurial.py (Diff revision 4)
The issue has been resolved. Show all issues
```
E128 continuation line under-indented for visual indent
```
rbtools/clients/mercurial.py (Diff revision 4)
The issue has been resolved. Show all issues
```
E128 continuation line under-indented for visual indent
```
rbtools/clients/mercurial.py (Diff revision 4)
The issue has been resolved. Show all issues
```
E231 missing whitespace after ','
```
rbtools/clients/mercurial.py (Diff revision 4)
The issue has been resolved. Show all issues
```
E303 too many blank lines (2)
```
rbtools/clients/mercurial.py (Diff revision 4)
The issue has been resolved. Show all issues
```
E231 missing whitespace after ','
```
rbtools/clients/mercurial.py (Diff revision 4)
The issue has been resolved. Show all issues
```
E231 missing whitespace after ','
```
rbtools/clients/mercurial.py (Diff revision 4)
The issue has been resolved. Show all issues
```
E501 line too long (80 > 79 characters)
```
rbtools/clients/mercurial.py (Diff revision 4)
The issue has been resolved. Show all issues
```
E501 line too long (86 > 79 characters)
```
rbtools/clients/mercurial.py (Diff revision 4)
The issue has been resolved. Show all issues
```
E128 continuation line under-indented for visual indent
```
rbtools/clients/mercurial.py (Diff revision 4)
The issue has been resolved. Show all issues
```
W391 blank line at end of file
```
rbtools/commands/land.py (Diff revision 4)
The issue has been resolved. Show all issues
```
E501 line too long (88 > 79 characters)
```
rbtools/commands/land.py (Diff revision 4)
The issue has been resolved. Show all issues
```
E265 block comment should start with '# '
```
rbtools/commands/land.py (Diff revision 4)
The issue has been resolved. Show all issues
```
E501 line too long (85 > 79 characters)
```
rbtools/commands/land.py (Diff revision 4)
The issue has been resolved. Show all issues
```
E501 line too long (86 > 79 characters)
```
rbtools/commands/tests/test_land.py (Diff revision 4)
The issue has been resolved. Show all issues
```
F401 'rbtools.commands.CommandError' imported but unused
```
rbtools/commands/tests/test_land.py (Diff revision 4)
The issue has been resolved. Show all issues
```
E303 too many blank lines (3)
```
rbtools/commands/tests/test_land.py (Diff revision 4)
The issue has been resolved. Show all issues
```
E231 missing whitespace after ','
```
rbtools/commands/tests/test_land.py (Diff revision 4)
The issue has been resolved. Show all issues
```
E303 too many blank lines (2)
```

Description:

~		rbt land supports Git, this change adds support for Mercurial as well.
	~	rbt land supports Git, this change adds support for Mercurial as well.
	+	`rbt land` works on bookmarks in mercurial.
	+	Mercurial supports merging and deleting bookmarks but not pushing upstream because
	+	bookmarks are usually not shared with the upstream, so it is left to the user to
	+	decide what they push.

Testing Done:

~		Currently,the following commands work on a Mercurial repository:
~		rbt land -r ## --local --no-delete-branch --no-squash
	~	Ran all unit tests
	~	Added unit tests for the new mercurial client functions.
	+	Tested some `rbt land` commands on a Mercurial repository including `--local`, not local, `--squash`, `--no-squash`.

Diff:

Revision 5 (+303 -20)

Show changes

	docs/rbtools/rbt/commands/land.rst
	rbtools/clients/mercurial.py
	rbtools/clients/tests/test_mercurial.py
	rbtools/commands/land.py

Checks run (1 failed, 1 succeeded)

flake8 failed.

JSHint passed.

flake8

```
Warning: Showing 30 of 32 failures.
```
rbtools/clients/mercurial.py (Diff revision 5)
The issue has been dropped. Show all issues
```
F401 'rbtools.clients.errors.PushError' imported but unused
```
rbtools/clients/mercurial.py (Diff revision 5)
The issue has been resolved. Show all issues
```
E128 continuation line under-indented for visual indent
```
rbtools/clients/mercurial.py (Diff revision 5)
The issue has been resolved. Show all issues
```
E128 continuation line under-indented for visual indent
```
rbtools/clients/mercurial.py (Diff revision 5)
The issue has been resolved. Show all issues
```
E128 continuation line under-indented for visual indent
```
rbtools/clients/mercurial.py (Diff revision 5)
The issue has been resolved. Show all issues
```
E128 continuation line under-indented for visual indent
```
rbtools/clients/mercurial.py (Diff revision 5)
The issue has been resolved. Show all issues
```
E127 continuation line over-indented for visual indent
```
rbtools/clients/mercurial.py (Diff revision 5)
The issue has been resolved. Show all issues
```
E127 continuation line over-indented for visual indent
```
rbtools/clients/mercurial.py (Diff revision 5)
The issue has been resolved. Show all issues
```
E231 missing whitespace after ','
```
rbtools/clients/mercurial.py (Diff revision 5)
The issue has been resolved. Show all issues
```
E231 missing whitespace after ','
```
rbtools/clients/mercurial.py (Diff revision 5)
The issue has been resolved. Show all issues
```
E501 line too long (83 > 79 characters)
```
rbtools/clients/mercurial.py (Diff revision 5)
The issue has been resolved. Show all issues
```
E128 continuation line under-indented for visual indent
```
rbtools/clients/tests/test_mercurial.py (Diff revision 5)
The issue has been resolved. Show all issues
```
E303 too many blank lines (2)
```
rbtools/clients/tests/test_mercurial.py (Diff revision 5)
The issue has been resolved. Show all issues
```
E231 missing whitespace after ','
```
rbtools/clients/tests/test_mercurial.py (Diff revision 5)
The issue has been resolved. Show all issues
```
E128 continuation line under-indented for visual indent
```
rbtools/clients/tests/test_mercurial.py (Diff revision 5)
The issue has been resolved. Show all issues
```
E128 continuation line under-indented for visual indent
```
rbtools/clients/tests/test_mercurial.py (Diff revision 5)
The issue has been resolved. Show all issues
```
E128 continuation line under-indented for visual indent
```
rbtools/clients/tests/test_mercurial.py (Diff revision 5)
The issue has been resolved. Show all issues
```
E128 continuation line under-indented for visual indent
```
rbtools/clients/tests/test_mercurial.py (Diff revision 5)
The issue has been resolved. Show all issues
```
E128 continuation line under-indented for visual indent
```
rbtools/clients/tests/test_mercurial.py (Diff revision 5)
The issue has been resolved. Show all issues
```
E128 continuation line under-indented for visual indent
```
rbtools/clients/tests/test_mercurial.py (Diff revision 5)
The issue has been resolved. Show all issues
```
E128 continuation line under-indented for visual indent
```
rbtools/clients/tests/test_mercurial.py (Diff revision 5)
The issue has been resolved. Show all issues
```
E128 continuation line under-indented for visual indent
```
rbtools/clients/tests/test_mercurial.py (Diff revision 5)
The issue has been resolved. Show all issues
```
E128 continuation line under-indented for visual indent
```
rbtools/clients/tests/test_mercurial.py (Diff revision 5)
The issue has been resolved. Show all issues
```
E128 continuation line under-indented for visual indent
```
rbtools/clients/tests/test_mercurial.py (Diff revision 5)
The issue has been resolved. Show all issues
```
E128 continuation line under-indented for visual indent
```
rbtools/clients/tests/test_mercurial.py (Diff revision 5)
The issue has been resolved. Show all issues
```
E231 missing whitespace after ','
```
rbtools/clients/tests/test_mercurial.py (Diff revision 5)
The issue has been resolved. Show all issues
```
E231 missing whitespace after ','
```
rbtools/clients/tests/test_mercurial.py (Diff revision 5)
The issue has been resolved. Show all issues
```
E303 too many blank lines (2)
```
rbtools/clients/tests/test_mercurial.py (Diff revision 5)
The issue has been resolved. Show all issues
```
E303 too many blank lines (3)
```
rbtools/commands/land.py (Diff revision 5)
The issue has been resolved. Show all issues
```
E501 line too long (88 > 79 characters)
```
rbtools/commands/land.py (Diff revision 5)
The issue has been resolved. Show all issues
```
E265 block comment should start with '# '
```

Summary:

[WIP] Add Mercurial support to rbt land

Add Mercurial support to rbt land

Commit:

49918777cca22250a5ec849de7f877eca783fbb3

c05a2cb424c28127d86182b7c1754b100f7a7f1f

Diff:

Revision 6 (+312 -23)

Show changes

	docs/rbtools/rbt/commands/land.rst
	rbtools/clients/mercurial.py
	rbtools/clients/tests/test_mercurial.py
	rbtools/commands/land.py
	rbtools/commands/patch.py

Checks run (1 failed, 1 succeeded)

flake8 failed.

JSHint passed.

flake8

rbtools/clients/mercurial.py (Diff revision 6)
The issue has been resolved. Show all issues
```
W503 line break before binary operator
```
rbtools/commands/land.py (Diff revision 6)
The issue has been resolved. Show all issues
```
W293 blank line contains whitespace
```
rbtools/commands/land.py (Diff revision 6)
The issue has been resolved. Show all issues
```
E501 line too long (80 > 79 characters)
```
rbtools/commands/land.py (Diff revision 6)
The issue has been resolved. Show all issues
```
E501 line too long (81 > 79 characters)
```

Commit:

c05a2cb424c28127d86182b7c1754b100f7a7f1f

c2440931c9e902beccb2cc5c25cd709177dcb221

Diff:

Revision 7 (+302 -22)

Show changes

	docs/rbtools/rbt/commands/land.rst
	rbtools/clients/mercurial.py
	rbtools/clients/tests/test_mercurial.py
	rbtools/commands/land.py

Checks run (1 failed, 1 succeeded)

flake8 failed.

JSHint passed.

flake8

rbtools/clients/mercurial.py (Diff revision 7)
The issue has been resolved. Show all issues
```
W503 line break before binary operator
```

Commit:

c2440931c9e902beccb2cc5c25cd709177dcb221

e5e878507aaafbf3e6a500bae20ba9f30c5e5d47

Diff:

Revision 8 (+302 -22)

Show changes

	docs/rbtools/rbt/commands/land.rst
	rbtools/clients/mercurial.py
	rbtools/clients/tests/test_mercurial.py
	rbtools/commands/land.py

Checks run (2 succeeded)

flake8 passed.

JSHint passed.

Testing Done:: Ran all unit tests
Added unit tests for the new mercurial client functions.
~ Tested some rbt land commands on a Mercurial repository including --local, not local, --squash, --no-squash.
~ Tested some rbt land commands on a Mercurial repository including --local,
+ not local, --squash, and --no-squash.

Status:: Discarded