Most checks were actually in place, but ExecFuture throws a CommandException which wasn't taken into account.
Details
Details
- Reviewers
richardvanvelzen - Commits
- Restricted Diffusion Commit
rP5d27aeb2403a: Fix the exception when watching the first commit of a mercurial repo
look at the first command and no longer saw an exception. Also, other commits worked as well.
Diff Detail
Diff Detail
- Branch
- hgnodiff
- Lint
Lint Passed - Unit
No Test Coverage
Event Timeline
Comment Actions
I think I came up with a significant simplification inline. Let me know if that works for you?
| src/applications/diffusion/query/rawdiff/DiffusionMercurialRawDiffQuery.php | ||
|---|---|---|
| 28 | I think we can do this instead: if ($against === null) {
$against = '('.$commit.'^ or null)';
}
...
diff -U %d --git --rev %s --rev %s -- %sThat is, the revset (x^ or null) seems to correctly select the parent if one exists, or the empty state if one does not. Mercurial isn't happy about the : syntax with this revset, but seems fine if we specify --rev twice. This has the notable advantage of letting us delete all the error handling. | |
Comment Actions
That indeed seems to work as well, and is a lot cleaner. :)
I do not have access to my working station until monday, so I'll just abandon this revision. Thanks!
Comment Actions
Oh, the reason we never caught this is that it works fine on my machine:
>>> orbital /INSECURE/repos/hg-private-remote $ hg diff -U 65535 --git --rev '5fbcc48003f65bfcbd88383049daf87d8bb6c1a2^':'5fbcc48003f65bfcbd88383049daf87d8bb6c1a2' -- 'FILE' >>> orbital /INSECURE/repos/hg-private-remote $ echo $? 0 >>> orbital /INSECURE/repos/hg-private-remote $ hg --version Mercurial Distributed SCM (version 2.2.3+87-d99d0b559084) (see http://mercurial.selenic.com for more information)
Presumably, this must be a recent change.