This is an archive of the discontinued Mercurial Phabricator instance.

Differential D906

registrar: fixing typo in comment
ClosedPublic

Authored by singhsrb on Oct 2 2017, 1:39 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGc1fe66e89f57: registrar: fixing typo in comment
Summary

I was just going through the module and noticed the typo. This commit
fixes 'onfalure' -> 'onfailure'.

Test Plan

Read it again :)

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

singhsrb created this revision.Oct 2 2017, 1:39 PM
indygreg accepted this revision.Oct 2 2017, 2:16 PM
This revision is now accepted and ready to land.Oct 2 2017, 2:16 PM
Closed by commit rHGc1fe66e89f57: registrar: fixing typo in comment (authored by singhsrb). · Explain WhyOct 2 2017, 2:17 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/registrar.py (2 lines)

Diff 2345

mercurial/registrar.py

========== ======== ======== ========= ========== ======== ======== =========
merge type precheck premerge fullmerge merge type precheck premerge fullmerge
========== ======== ======== ========= ========== ======== ======== =========
nomerge x x x nomerge x x x
mergeonly o x o mergeonly o x o
fullmerge o o o fullmerge o o o
========== ======== ======== ========= ========== ======== ======== =========
Optional argument 'onfalure' is the format of warning message Optional argument 'onfailure' is the format of warning message
to be used at failure of merging (target filename is specified to be used at failure of merging (target filename is specified
at formatting). Or, None or so, if warning message should be at formatting). Or, None or so, if warning message should be
suppressed. suppressed.
Optional argument 'precheck' is the function to be used Optional argument 'precheck' is the function to be used
before actual invocation of internal merge tool itself. before actual invocation of internal merge tool itself.
It takes as same arguments as internal merge tool does, other than It takes as same arguments as internal merge tool does, other than
'files' and 'labels'. If it returns false value, merging is aborted 'files' and 'labels'. If it returns false value, merging is aborted