Augie Fackler avatar Augie Fackler committed 0e5b007

Clean up tests to allow them to pass against more hg versions.

Comments (0)

Files changed (4)

tests/test-remotebranches

 cd alpha
 mkcommit a
 mkcommit b
-hg branch stable
+hg branch stable | grep -v 'permanent and global'
 mkcommit c
 cd ..
 hg clone alpha beta | $FILTERPWD
 hg pull | $FILTERPWD
 hg pull beta | $FILTERPWD
 hg co -C default
-hg branch default
+hg branch default | grep -v 'permanent and global'
 mkcommit e
 hg merge stable
 hg ci -m 'merging stable'

tests/test-remotebranches-with-aliases.t

   $ cd alpha
   $ mkcommit 0
   $ mkcommit 1
-  $ hg branch stable
+  $ hg branch stable | grep -v 'permanent and global'
   marked working directory as branch stable
   $ mkcommit 2
   $ cd ..
   $ hg co -C default
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
-  $ hg branch default
+  $ hg branch default | grep -v 'permanent and global'
   marked working directory as branch default
 
   $ mkcommit 4

tests/test-remotebranches-with-schemes

 cd alpha
 mkcommit a
 mkcommit b
-hg branch stable
+hg branch stable | grep -v 'permanent and global'
 mkcommit c
 cd ..
 hg clone alpha beta | $FILTERPWD
 hg pull | $FILTERPWD
 hg pull beta | $FILTERPWD
 hg co -C default
-hg branch default
+hg branch default | grep -v 'permanent and global'
 mkcommit e
 hg merge stable
 hg ci -m 'merging stable'

tests/test-remotebranches.t

   $ cd alpha
   $ mkcommit a
   $ mkcommit b
-  $ hg branch stable
+  $ hg branch stable | grep -v 'permanent and global'
   marked working directory as branch stable
   $ mkcommit c
   $ cd ..
   (run 'hg update' to get a working copy)
   $ hg co -C default
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ hg branch default
+  $ hg branch default | grep -v 'permanent and global'
   marked working directory as branch default
   $ mkcommit e
   $ hg merge stable
   summary:     merging stable
   
 Verify that the revsets operate as expected:
-  $ hg log --graph -r 'not pushed()'
-  @    changeset:   6:ce61ec32ee23
-  |\   tag:         tip
-  | |  parent:      5:6d6442577283
-  | |  parent:      4:8948da77173b
-  | |  user:        test
-  | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  summary:     merging stable
-  | |
-  | o  changeset:   5:6d6442577283
-  | |  parent:      3:78f83396d79e
-  | |  user:        test
-  | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  summary:     add e
-  | |
+  $ hg log -r 'not pushed()'
+  changeset:   5:6d6442577283
+  parent:      3:78f83396d79e
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     add e
+  
+  changeset:   6:ce61ec32ee23
+  tag:         tip
+  parent:      5:6d6442577283
+  parent:      4:8948da77173b
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     merging stable
+  
+
 
 Upstream without configuration is synonymous with pushed():
-  $ hg log --graph -r 'not upstream()'
-  @    changeset:   6:ce61ec32ee23
-  |\   tag:         tip
-  | |  parent:      5:6d6442577283
-  | |  parent:      4:8948da77173b
-  | |  user:        test
-  | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  summary:     merging stable
-  | |
-  | o  changeset:   5:6d6442577283
-  | |  parent:      3:78f83396d79e
-  | |  user:        test
-  | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  summary:     add e
-  | |
+  $ hg log -r 'not upstream()'
+  changeset:   5:6d6442577283
+  parent:      3:78f83396d79e
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     add e
+  
+  changeset:   6:ce61ec32ee23
+  tag:         tip
+  parent:      5:6d6442577283
+  parent:      4:8948da77173b
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     merging stable
+  
 
 but configured, it'll do the expected thing:
   $ echo '[remotebranches]' >> .hg/hgrc
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.