Yuya Nishihara <yuya@tcha.org> [Mon, 05 Oct 2020 20:53:34 +0900] rev 45722
stringutil: extract helper function that splits stringmatcher() pattern
Yuya Nishihara <yuya@tcha.org> [Wed, 09 Sep 2020 17:17:38 +0900] rev 45721
grep: extract main search loop as searcher method
Still displayer part is in commands.grep(), the core grep logic is now
reusable. I'll revisit the displayer stuff later since it will be another
long series.
Yuya Nishihara <yuya@tcha.org> [Sun, 04 Oct 2020 13:17:57 +0900] rev 45720
scmutil: move walkchangerevs() from cmdutil
It's no longer a command-level function, but a pure helper to walk revisions
in a windowed way. This change will help eliminate reverse dependency of
revset.py -> grep.py -> cmdutil.py in future patches.
Yuya Nishihara <yuya@tcha.org> [Wed, 09 Sep 2020 17:04:44 +0900] rev 45719
grep: extract public function to register file to be skipped
The main grep loop will be extracted to a searcher method, but this skipping
condition depends on the result of display() function.
Matt Harbison <matt_harbison@yahoo.com> [Tue, 13 Oct 2020 16:44:57 -0400] rev 45718
posix: avoid a leaked file descriptor in a unix domain socket exception case
Differential Revision: https://phab.mercurial-scm.org/D9206
Matt Harbison <matt_harbison@yahoo.com> [Tue, 13 Oct 2020 16:41:01 -0400] rev 45717
posix: use context managers in a couple of places
Differential Revision: https://phab.mercurial-scm.org/D9205
Kyle Lippincott <spectral@google.com> [Wed, 14 Oct 2020 14:43:39 -0700] rev 45716
record: when backing up, avoid generating very long filenames
If the original file's path is longer than the individual filename maximum
length (256 on Linux, I believe?), then this mechanism of "replace slashes with
underscores" causes an error.
Now, we'll produce just the "basename" of the file, plus some stuff to ensure
it's unique. This can be potentially confusing for users if there's a file with
the same name in multiple directories, but I suspect that this is better than
just breaking.
Example:
`<reporoot>/a/long/path/to/somefile.txt` used to be backed up as
`<reporoot>/.hg/record-backups/a_long_path_to_somefile.txt.abcdefgh`, it will
now be backed up as `<reporoot>/.hg/record-backups/somefile.txt.abcdefgh`
We could do the naive thing (what we were doing before) and have it to doing
something with either subdirectories
(`<backuproot>/a/long/path/to/somefile.txt.abcdefgh` or minimize #dirs with
`<backuproot>/a_long_path/to_somefile.txt.abcdefgh`), prefix-truncated paths
(such as `<backuproot>/__ath_to_somefile.txt.abcdefgh`, where that `__` elides
enough to get us under 255 chars (counting the +9 we need to add!)), or
hash-of-dirname (`<backuproot>/<sha1sum_of_dirname>/somefile.txt.abcdefgh`), but
ultimately every option felt over engineered and that it would be more likely to
cause problems than it would be to solve any, especially if it was conditional
on directory length.
Differential Revision: https://phab.mercurial-scm.org/D9207
Pulkit Goyal <7895pulkit@gmail.com> [Sat, 10 Oct 2020 12:43:04 +0530] rev 45715
mergestate: add `allextras()` to get all extras
`extras()` can only be used for getting extra for a file. However at
couple of places in code, we wanted to iterate over all the extras stored with
the mergestate and they were accessing the private `_stateextras`.
We add a new function for this.
Differential Revision: https://phab.mercurial-scm.org/D9190
Pulkit Goyal <7895pulkit@gmail.com> [Tue, 06 Oct 2020 19:11:34 +0530] rev 45714
mergestate: document `o` merge record state in _mergestate_base docs
_mergestate_base documentation serves as a nice documentation for mergestate.
This also documents known merge records and known merge record states.
I missed adding `o` state to it when I introduced it. Let's add it now.
Differential Revision: https://phab.mercurial-scm.org/D9156
Matt Harbison <matt_harbison@yahoo.com> [Fri, 09 Oct 2020 00:33:50 -0400] rev 45713
fix: update commit hash references in the new commits
Differential Revision: https://phab.mercurial-scm.org/D9183
Matt Harbison <matt_harbison@yahoo.com> [Fri, 09 Oct 2020 00:14:07 -0400] rev 45712
absorb: update commit hash references in the new commits
Differential Revision: https://phab.mercurial-scm.org/D9182
Matt Harbison <matt_harbison@yahoo.com> [Thu, 08 Oct 2020 23:33:04 -0400] rev 45711
rewriteutil: handle dropped commits when updating description hashes
In looking to leverage this with the absorb extension, the old -> new mapping
there allows the new value to be None. We could filter that out and not pass it
to this method, but it seems worth a message to the user. (I wonder if these
should be an info or warning, because it's unlikely people are using `-v`
regularly.)
Differential Revision: https://phab.mercurial-scm.org/D9181
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 09 Oct 2020 10:20:53 +0200] rev 45710
dirstate-tree: move a conditional in an explicit boolean
This will help readability a bit and make the next change simpler to read.
Differential Revision: https://phab.mercurial-scm.org/D9202
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 08 Oct 2020 18:50:46 +0200] rev 45709
rust: cleanup some white space in a dock
They seems to have sneaked there somehow.
Differential Revision: https://phab.mercurial-scm.org/D9201
Pulkit Goyal <7895pulkit@gmail.com> [Sat, 10 Oct 2020 13:19:25 +0530] rev 45708
commit: pass ChangingFiles object as argument to _process_files
Instead of returning it, we pass it as an argument. This makes the whole if-else
in `_prepare_files` a bit simpler. Else each if-else branch was creating the
object.
Differential Revision: https://phab.mercurial-scm.org/D9194
Pulkit Goyal <7895pulkit@gmail.com> [Sat, 10 Oct 2020 13:15:20 +0530] rev 45707
commit: pass mergestate into `_process_files` instead of re-reading it
Differential Revision: https://phab.mercurial-scm.org/D9193