- Sep 22, 2018
-
-
Matt Harbison authored
The rev number ended up being 11 instead of 13 on Windows. If I ever get back to issue2020, this will go away.
-
- Sep 21, 2018
-
-
Martin von Zweigbergk authored
We have supported 'no-' prefixes for boolean flag for a few years now, so I was expecting it to be --no-dates. I noticed that we have --nodates options for a few more commands (e.g. `hg diff`), but I'll leave that for another day. Differential Revision: https://phab.mercurial-scm.org/D4693
-
Matt Harbison authored
test-hghave.t was failing with: feature hardlink failed: argument 1: <class 'TypeError'>: wrong type
-
Martin von Zweigbergk authored
This was another leftover from 576eef1ab43d (narrow: move .hg/narrowspec to .hg/store/narrowspec (BC), 2018-08-02), in addition to 623081f2abc2 (narrow: remove hack to write narrowspec to shared .hg directory, 2018-09-12). Differential Revision: https://phab.mercurial-scm.org/D4692
-
Augie Fackler authored
It's gone in Python 3, and you can't *ctxs into a with statement. Sigh. Differential Revision: https://phab.mercurial-scm.org/D4690
-
Augie Fackler authored
# skip-blame just an r prefix on a string Differential Revision: https://phab.mercurial-scm.org/D4691
-
Augie Fackler authored
Differential Revision: https://phab.mercurial-scm.org/D4689
-
- Sep 15, 2018
-
-
Yuya Nishihara authored
It's weird that we have both --active and --inactive options meaning completely different things. Instead of adding a one-off option, let's document the way to display the active bookmark by using -l/--list. No deprecated option is added since --active isn't released yet.
-
Yuya Nishihara authored
This is a generalized form of the --active option. A redundant sorted() call is removed. There was no point to update dict items in lexicographical order.
-
Yuya Nishihara authored
A deleted bookmark is neither active nor inactive.
-
Yuya Nishihara authored
The --inactive option can't be directly mapped to an action or a modifier. With any names, it means to add/rename to inactive bookmarks. Without names, it means to deactivate the current bookmark. This patch separates them to "inactive" flag and "action == 'inactive'".
-
Yuya Nishihara authored
This prepares for adding -l/--list option, which can be combined with the positional arguments.
-
Yuya Nishihara authored
-
Yuya Nishihara authored
-
Yuya Nishihara authored
-
Yuya Nishihara authored
This clarifies that user options have to be processed before calling printbookmarks().
-
- Sep 19, 2018
-
-
Boris Feld authored
Internal changeset can be safely garbage collected, so we can ignore them during safestrip. (Another phase for internal changeset that must be kept in the repository might be introduced later).
-
- Jun 06, 2018
-
-
Boris Feld authored
When the internal phase is used, the internal commits we create during shelve will be automatically hidden, and we don't need to strip them. Avoiding strips gives much better performances and is less traumatic for caches. Test changes are all related to revision numbers increasing more quickly since we avoid stripping. At the end of `test-shelve.t` we now need manually strip the shelve-commit in addition to the x.shelve file deletion. This emulates a preexisting shelve after a repository upgrade. Note: The hidden internal commits confuses rebase a bit as shown by a new test added. This will happen when the user have shelve commits on top of a changeset to be rebased. We'll fix this in the next commit. As we still use a backup bundle, rebase can just strip the internal changesets and be fine.
-
- Sep 19, 2018
-
-
Martin von Zweigbergk authored
This tells meld to resolve trivial conflicts before presenting the user with the remaining conflicts. This was attempted 5 years ago, but then --auto-merge was too new that the patch was rejected out of concern that users still had an older version of meld installed [1]. Maybe it's safe to assume that they have a newer version now. [1] https://www.mercurial-scm.org/pipermail/mercurial-devel/2013-April/050084.html Differential Revision: https://phab.mercurial-scm.org/D4665
-
- Sep 21, 2018
-
-
Matt Harbison authored
In 7f8b7a060584, I quoted this to support python being installed to "Program Files". Even though the string passed to os.popen() is this: "c:/Python27/python.exe" -c "import mercurial; print (mercurial.__path__[0])" ... cmd.exe is trying to run this: 'c:/Python27/python.exe" -c "import' This caused test-hghave.t to fail, reporting 'unexpected mercurial lib: ""', because the failed execution prints nothing to stdout. Py3 fails as though it's not quoted. For whatever reason, print() shows up in the output when run with py2, but not py3, so I'm having a hard time debugging this. For now, let's fix the buildbot.
-
- Sep 20, 2018
-
-
Pulkit Goyal authored
Python 3 does not allow to use '%s' for integers. Differential Revision: https://phab.mercurial-scm.org/D4688
-
Pulkit Goyal authored
This makes the test work on Python 3. Differential Revision: https://phab.mercurial-scm.org/D4687
-
- Sep 19, 2018
-
-
Yuya Nishihara authored
While rewriting chg in Rust, I noticed the server leaks the client's pager fd. This isn't a problem right now since the IPC process terminates earlier than the pager, but I believe the fds attached within a "runcommand" request should be released as soon as the session ends.
-
Yuya Nishihara authored
I want to make it use a separate saved buffer for "attachio" requests within "runcommand" session. See the next patch for details.
-
- Sep 15, 2018
-
-
Yuya Nishihara authored
They are just printable messages, not data that should be fed to JSON or templater.
-
Yuya Nishihara authored
Each dict should represent data of the same kind.
-
Yuya Nishihara authored
-
- Sep 20, 2018
-
-
Kyle Lippincott authored
We have an overlay filesystem which shows the entire repository, and unlinking a file that's in the underlying data store will create "tombstone" entries, which are going to cause our automatic tracking to re-add these directories. We need to use a different (non-posix) interface to clean up items in the working directory that are no longer relevant. Extracting this to a function lets us use extensions.wrappedfunction and perform this cleanup work, even if the paths aren't in the dirstate (they may have been removed in the past and thus entirely "tombstone" entries already, part of hgignore, exclusively directories (possibly empty), or other edge cases). Differential Revision: https://phab.mercurial-scm.org/D4681
-
Augie Fackler authored
I got concerned about the correctness of the pruning logic, but I was misreading it. I didn't figure that out until I walked all the way back to 0252abaafb8a from 20111, where I was finally able to see (in the deleted side of the change!) a complete explanation from b6d9ea0bc107 in 2005. Differential Revision: https://phab.mercurial-scm.org/D4686
-
Augie Fackler authored
It's extracted so extensions can filter manifest nodes if needed. This is an unfortunate hack, but I think I only need it for manifests. The long-term solution will be to rework the relationship between changegroups and storage so that this isn't required. Differential Revision: https://phab.mercurial-scm.org/D4685
-
Augie Fackler authored
Differential Revision: https://phab.mercurial-scm.org/D4684
-
Pulkit Goyal authored
Differential Revision: https://phab.mercurial-scm.org/D4677
-
Pulkit Goyal authored
Differential Revision: https://phab.mercurial-scm.org/D4676
-
Pulkit Goyal authored
Differential Revision: https://phab.mercurial-scm.org/D4675
-
Pulkit Goyal authored
# skip-blame because just b'' prefixes Differential Revision: https://phab.mercurial-scm.org/D4674
-
Pulkit Goyal authored
Differential Revision: https://phab.mercurial-scm.org/D4673
-
Pulkit Goyal authored
# skip-blame because just b'' prefixes Differential Revision: https://phab.mercurial-scm.org/D4672
-
Pulkit Goyal authored
Differential Revision: https://phab.mercurial-scm.org/D4671
-
Pulkit Goyal authored
Differential Revision: https://phab.mercurial-scm.org/D4670
-
- Sep 17, 2018
-
-
Anton Shestakov authored
Support for bundle2 streaming clones has been shipped in Mercurial 4.5 (7eedbd5d4880), but was never activated by default. It's time to have more people use it. The new format allows streaming clones to transport cache (hooray for speed) and phaseroots (fixes phase-related issues). Changes in tests: bundle2 capabilities now have "stream=v2" (plus a '\n' as a separator) and therefore take 14 bytes more: "%0Astream%3Dv2". Tip for tests that have data encoded with CBOR: 0xd3 - 0xc5 = 14. $USUAL_BUNDLE2_CAPS$ replaces $USUAL_BUNDLE2_CAPS_SERVER$, which is the same thing, but without "stream=v2". Since streaming clones now also transfer caches, the reported byte and file counts are higher (e.g. 816 bytes in 9 files instead of 613 bytes in 4 files, a bit of --debug and manual math confirms that the caches take these extra 203 bytes in 5 files). Differential Revision: https://phab.mercurial-scm.org/D4680
-