Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
mercurial-devel
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mercurial
mercurial-devel
Commits
6045a8c4
Commit
6045a8c4
authored
15 years ago
by
Sune Foldager
Browse files
Options
Downloads
Patches
Plain Diff
extdiff: respect --option in command aliases (issue949)
parent
d6a30771
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
hgext/extdiff.py
+2
-1
2 additions, 1 deletion
hgext/extdiff.py
tests/test-extdiff
+6
-0
6 additions, 0 deletions
tests/test-extdiff
tests/test-extdiff.out
+5
-0
5 additions, 0 deletions
tests/test-extdiff.out
with
13 additions
and
1 deletion
hgext/extdiff.py
+
2
−
1
View file @
6045a8c4
...
...
@@ -253,7 +253,8 @@
def
save
(
cmd
,
path
,
diffopts
):
'''
use closure to save diff command to use
'''
def
mydiff
(
ui
,
repo
,
*
pats
,
**
opts
):
return
dodiff
(
ui
,
repo
,
path
,
diffopts
,
pats
,
opts
)
return
dodiff
(
ui
,
repo
,
path
,
diffopts
+
opts
[
'
option
'
],
pats
,
opts
)
doc
=
_
(
'''
\
use %(path)s to diff repository (or selected files)
...
...
This diff is collapsed.
Click to expand it.
tests/test-extdiff
+
6
−
0
View file @
6045a8c4
...
...
@@ -65,3 +65,9 @@
hg extdiff
-p
`
pwd
`
/differ.py
# will change to /tmp/extdiff.TMP and populate directories a.TMP and a and start tool
echo
'% diff in working directory, after'
hg diff
--git
echo
echo
%
test
extdiff with
--option
hg extdiff
-p
echo
-o
this
-c
1
hg falabala
-o
this
-c
1
echo
This diff is collapsed.
Click to expand it.
tests/test-extdiff.out
+
5
−
0
View file @
6045a8c4
...
...
@@ -68,3 +68,8 @@
-b
+changed
+edited
% test extdiff with --option
this a.8a5febb7f867/a a.34eed99112ab/a
diffing this a.8a5febb7f867/a a.34eed99112ab/a
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment