Patchwork [1,of,2,v2] tests: fix check for --graph option in test-log-linerange.t

login
register
mail settings
Submitter Denis Laxalde
Date Feb. 11, 2018, 6:05 p.m.
Message ID <f994010b9f093a164587.1518372325@marimba>
Download mbox | patch
Permalink /patch/27575/
State Accepted
Headers show

Comments

Denis Laxalde - Feb. 11, 2018, 6:05 p.m.
# HG changeset patch
# User Denis Laxalde <denis@laxalde.org>
# Date 1518356135 -3600
#      Sun Feb 11 14:35:35 2018 +0100
# Node ID f994010b9f093a1645875b4e905fcf9d21a5eaa9
# Parent  f91b7f26c68ac87961aa6ef883ba96e5a2822ad3
# EXP-Topic log/linerange-graph
tests: fix check for --graph option in test-log-linerange.t

Previous test about incompatibility of --line-range and --graph options
was problematic because, even without --graph option, the command would
have failed because specified path (dir/baz) did not exist as it got
dropped in previous test statements. New test statements should work
without --graph. This prepares for making --line-range compatible with
--graph option.
Yuya Nishihara - Feb. 12, 2018, 12:07 a.m.
On Sun, 11 Feb 2018 19:05:25 +0100, Denis Laxalde wrote:
> # HG changeset patch
> # User Denis Laxalde <denis@laxalde.org>
> # Date 1518356135 -3600
> #      Sun Feb 11 14:35:35 2018 +0100
> # Node ID f994010b9f093a1645875b4e905fcf9d21a5eaa9
> # Parent  f91b7f26c68ac87961aa6ef883ba96e5a2822ad3
> # EXP-Topic log/linerange-graph
> tests: fix check for --graph option in test-log-linerange.t

Queued this, thanks.

> This prepares for making --line-range compatible with
> --graph option.

Actually that is the last part of my series. I'll send it out shortly.

Patch

diff --git a/tests/test-log-linerange.t b/tests/test-log-linerange.t
--- a/tests/test-log-linerange.t
+++ b/tests/test-log-linerange.t
@@ -172,6 +172,9 @@  Add some changes with two diff hunks
   +3
   +4
   
+  $ hg log -f --graph -L foo,5:7 -p
+  abort: graph not supported with line range patterns
+  [255]
 
 With --template.
 
@@ -849,9 +852,3 @@  We get an error for removed files.
   $ hg log -f -L dir/baz,5:7 -p
   abort: cannot follow file not in parent revision: "dir/baz"
   [255]
-
-Graph log does work yet.
-
-  $ hg log -f -L dir/baz,5:7 --graph
-  abort: graph not supported with line range patterns
-  [255]