subrepo/svn: improve error message on missing files
From:
abort: failed to commit svn changes
to:
abort: cannot commit missing svn entries
subrepo/svn: abort on commit with missing file (
issue3029)
Previous code was printing a traceback because it expected some error output
from svn. But sometimes our definition of "changed" differs with the subversion
one. For instance, subversion ignores missing files when committing. And when
there are only missing files, svn commit will be a successful no-op with no
output. Still, we should stick to our definition including missing files in
changes as doing otherwise could cause surprising behaviour for the user.
doc: flatten description of 'matching()' predicate to be formatted well
current description of 'matching()' revset predicate can't be
formatted well on "hg help revset" output.
each descriptions for revset predicates (or something like them) are
split-ed into lines, and spaces on left side of them are stripped
before minirst processing. so, bullet list can't be nested.
this patch just flattens description of 'matching()' predicate to be
formatted well.
subrepo: fix default implementation of forget() (
issue3404)
test-subrepo-svn: fix non-determinism
The test was randomly failing with:
--- /tests/test-subrepo-svn.t
+++ /test-subrepo-svn.t.err
@@ -273,10 +273,10 @@
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd t/s
$ svn status
- ? * a (glob)
- X * externals (glob)
- ? * f1 (glob)
- ? * f2 (glob)
+ ? f1
+ ? f2
+ ? a
+ X externals
Performing status on external item at 'externals'* (glob)
test-convert-svn-source: fix non-determinism
This test was failing randomly with:
--- /tests/test-convert-svn-source.t
+++ /tests/test-convert-svn-source.t.err
@@ -35,8 +35,8 @@
$ svnurl="file://$svnpath/svn-repo/proj%20B"
$ svn import -m "init projB" projB "$svnurl" | fixpath
+ Adding projB/tags
Adding projB/mytrunk
- Adding projB/tags
Committed revision 1.
patch: be more tolerant with EOLs in binary diffs (
issue2870)
The only place where an trailing CR could be meaningful is in the "diff --git"
line as part of a filename, and existing code already rule out this
possibility. Extend the CR/LF filtering to the whole binary hunk.