Submitter | phabricator |
---|---|
Date | Oct. 22, 2019, 5:56 p.m. |
Message ID | <632b08555557be83d4d7f8c93780e6c1@localhost.localdomain> |
Download | mbox | patch |
Permalink | /patch/42532/ |
State | Not Applicable |
Headers | show |
Comments
Patch
diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -6770,6 +6770,11 @@ else: terse = ui.config(b'commands', b'status.terse') + if not revs and not change: + # Avoid loading obsmarkers if we're accessing only the working copy + # parent (which will never be hidden). + repo = repo.unfiltered() + if revs and change: msg = _(b'cannot specify --rev and --change at the same time') raise error.Abort(msg)