upstream/mercurial-mirror Files · tests/test-mq-qrefresh.out

Do not use osutil.c with python 2.4 and Windows (issue1364)...

Do not use osutil.c with python 2.4 and Windows (issue1364) Windows python 2.4 os.stat() reports times including DST offset, while osutil.c reports the correct value, which makes status() systematically compare files content. This bug is fixed in python 2.5. Using osutil.py instead of osutil.c is 4x times slower on large repositories but current code is completely unusable. Given few people are likely to use python 2.4 on Windows this solution was considered a good trade-off compared to more invasive solutions trying to address the offset issue.

Steve Losh - - Load All Authors

File last commit:

r10397:8cb81d75 default


                r10521:bde1bb25

stable

Download file

             test-mq-qrefresh.out
        
                    301 lines
            
             | 4.2 KiB
            
                | text/plain
            
             |
                TextLexer

/ tests / test-mq-qrefresh.out

History | Source | Raw |Copy content |Copy permalink

Giorgos Keramidas tests: add new test; test-mq-qrefresh	r3136	% init
		% commit
		adding 1/base
		adding 2/base
		% qnew mqbase
		% qrefresh
		% qdiff
		diff -r b55ecdccb5cf 1/base
		--- a/1/base
		+++ b/1/base
Matt Mackall diff: don't show function name by default...	r5863	@@ -1,1 +1,1 @@
Giorgos Keramidas tests: add new test; test-mq-qrefresh	r3136	-base
		+patched
		diff -r b55ecdccb5cf 2/base
		--- a/2/base
		+++ b/2/base
Matt Mackall diff: don't show function name by default...	r5863	@@ -1,1 +1,1 @@
Giorgos Keramidas tests: add new test; test-mq-qrefresh	r3136	-base
		+patched
		% qdiff dirname
		diff -r b55ecdccb5cf 1/base
		--- a/1/base
		+++ b/1/base
Matt Mackall diff: don't show function name by default...	r5863	@@ -1,1 +1,1 @@
Giorgos Keramidas tests: add new test; test-mq-qrefresh	r3136	-base
		+patched
		diff -r b55ecdccb5cf 2/base
		--- a/2/base
		+++ b/2/base
Matt Mackall diff: don't show function name by default...	r5863	@@ -1,1 +1,1 @@
Giorgos Keramidas tests: add new test; test-mq-qrefresh	r3136	-base
		+patched
		% patch file contents
Steve Losh mq: add parent node IDs to MQ patches on qrefresh/qnew...	r10397	# HG changeset patch
		# Parent
Giorgos Keramidas tests: add new test; test-mq-qrefresh	r3136	mqbase

		diff -r b55ecdccb5cf 1/base
		--- a/1/base
		+++ b/1/base
Matt Mackall diff: don't show function name by default...	r5863	@@ -1,1 +1,1 @@
Giorgos Keramidas tests: add new test; test-mq-qrefresh	r3136	-base
		+patched
		diff -r b55ecdccb5cf 2/base
		--- a/2/base
		+++ b/2/base
Matt Mackall diff: don't show function name by default...	r5863	@@ -1,1 +1,1 @@
Giorgos Keramidas tests: add new test; test-mq-qrefresh	r3136	-base
		+patched
		% qrefresh 1
		% qdiff
		diff -r b55ecdccb5cf 1/base
		--- a/1/base
		+++ b/1/base
Matt Mackall diff: don't show function name by default...	r5863	@@ -1,1 +1,1 @@
Giorgos Keramidas tests: add new test; test-mq-qrefresh	r3136	-base
		+patched
		diff -r b55ecdccb5cf 2/base
		--- a/2/base
		+++ b/2/base
Matt Mackall diff: don't show function name by default...	r5863	@@ -1,1 +1,1 @@
Giorgos Keramidas tests: add new test; test-mq-qrefresh	r3136	-base
		+patched
		% qdiff dirname
		diff -r b55ecdccb5cf 1/base
		--- a/1/base
		+++ b/1/base
Matt Mackall diff: don't show function name by default...	r5863	@@ -1,1 +1,1 @@
Giorgos Keramidas tests: add new test; test-mq-qrefresh	r3136	-base
		+patched
		diff -r b55ecdccb5cf 2/base
		--- a/2/base
		+++ b/2/base
Matt Mackall diff: don't show function name by default...	r5863	@@ -1,1 +1,1 @@
Giorgos Keramidas tests: add new test; test-mq-qrefresh	r3136	-base
		+patched
		% patch file contents
Steve Losh mq: add parent node IDs to MQ patches on qrefresh/qnew...	r10397	# HG changeset patch
		# Parent
Giorgos Keramidas tests: add new test; test-mq-qrefresh	r3136	mqbase

		diff -r b55ecdccb5cf 1/base
		--- a/1/base
		+++ b/1/base
Matt Mackall diff: don't show function name by default...	r5863	@@ -1,1 +1,1 @@
Giorgos Keramidas tests: add new test; test-mq-qrefresh	r3136	-base
		+patched
		% qrefresh . in subdir
		% qdiff
		diff -r b55ecdccb5cf 1/base
		--- a/1/base
		+++ b/1/base
Matt Mackall diff: don't show function name by default...	r5863	@@ -1,1 +1,1 @@
Giorgos Keramidas tests: add new test; test-mq-qrefresh	r3136	-base
		+patched
		diff -r b55ecdccb5cf 2/base
		--- a/2/base
		+++ b/2/base
Matt Mackall diff: don't show function name by default...	r5863	@@ -1,1 +1,1 @@
Giorgos Keramidas tests: add new test; test-mq-qrefresh	r3136	-base
		+patched
		% qdiff dirname
		diff -r b55ecdccb5cf 1/base
		--- a/1/base
		+++ b/1/base
Matt Mackall diff: don't show function name by default...	r5863	@@ -1,1 +1,1 @@
Giorgos Keramidas tests: add new test; test-mq-qrefresh	r3136	-base
		+patched
		diff -r b55ecdccb5cf 2/base
		--- a/2/base
		+++ b/2/base
Matt Mackall diff: don't show function name by default...	r5863	@@ -1,1 +1,1 @@
Giorgos Keramidas tests: add new test; test-mq-qrefresh	r3136	-base
		+patched
		% patch file contents
Steve Losh mq: add parent node IDs to MQ patches on qrefresh/qnew...	r10397	# HG changeset patch
		# Parent
Giorgos Keramidas tests: add new test; test-mq-qrefresh	r3136	mqbase

		diff -r b55ecdccb5cf 1/base
		--- a/1/base
		+++ b/1/base
Matt Mackall diff: don't show function name by default...	r5863	@@ -1,1 +1,1 @@
Giorgos Keramidas tests: add new test; test-mq-qrefresh	r3136	-base
		+patched
		% qrefresh in hg-root again
		% qdiff
		diff -r b55ecdccb5cf 1/base
		--- a/1/base
		+++ b/1/base
Matt Mackall diff: don't show function name by default...	r5863	@@ -1,1 +1,1 @@
Giorgos Keramidas tests: add new test; test-mq-qrefresh	r3136	-base
		+patched
		diff -r b55ecdccb5cf 2/base
		--- a/2/base
		+++ b/2/base
Matt Mackall diff: don't show function name by default...	r5863	@@ -1,1 +1,1 @@
Giorgos Keramidas tests: add new test; test-mq-qrefresh	r3136	-base
		+patched
		% qdiff dirname
		diff -r b55ecdccb5cf 1/base
		--- a/1/base
		+++ b/1/base
Matt Mackall diff: don't show function name by default...	r5863	@@ -1,1 +1,1 @@
Giorgos Keramidas tests: add new test; test-mq-qrefresh	r3136	-base
		+patched
		diff -r b55ecdccb5cf 2/base
		--- a/2/base
		+++ b/2/base
Matt Mackall diff: don't show function name by default...	r5863	@@ -1,1 +1,1 @@
Giorgos Keramidas tests: add new test; test-mq-qrefresh	r3136	-base
		+patched
		% patch file contents
Steve Losh mq: add parent node IDs to MQ patches on qrefresh/qnew...	r10397	# HG changeset patch
		# Parent
Giorgos Keramidas tests: add new test; test-mq-qrefresh	r3136	mqbase

		diff -r b55ecdccb5cf 1/base
		--- a/1/base
		+++ b/1/base
Matt Mackall diff: don't show function name by default...	r5863	@@ -1,1 +1,1 @@
Giorgos Keramidas tests: add new test; test-mq-qrefresh	r3136	-base
		+patched
		diff -r b55ecdccb5cf 2/base
		--- a/2/base
		+++ b/2/base
Matt Mackall diff: don't show function name by default...	r5863	@@ -1,1 +1,1 @@
Giorgos Keramidas tests: add new test; test-mq-qrefresh	r3136	-base
		+patched
Mads Kiilerich mq: Fix --qrefresh --short to work with --exclude and --include...	r7177
		% qrefresh --short tests:
		% - add 1/base and 2/base one by one
		% -- qdiff output
Mads Kiilerich mq: Allow qrefresh --silent to take parameters...	r7113	diff -r b55ecdccb5cf 1/base
		--- a/1/base
		+++ b/1/base
		@@ -1,1 +1,1 @@
		-base
		+patched
		diff -r b55ecdccb5cf 2/base
		--- a/2/base
		+++ b/2/base
		@@ -1,1 +1,1 @@
		-base
		+patched
		diff -r b55ecdccb5cf orphanchild
		--- /dev/null
		+++ b/orphanchild
		@@ -0,0 +1,1 @@
		+orphan
Mads Kiilerich mq: Fix --qrefresh --short to work with --exclude and --include...	r7177	% -- patch file content
Steve Losh mq: add parent node IDs to MQ patches on qrefresh/qnew...	r10397	# HG changeset patch
		# Parent
Mads Kiilerich mq: Allow qrefresh --silent to take parameters...	r7113	mqbase

		diff -r b55ecdccb5cf 1/base
		--- a/1/base
		+++ b/1/base
		@@ -1,1 +1,1 @@
		-base
		+patched
		diff -r b55ecdccb5cf 2/base
		--- a/2/base
		+++ b/2/base
		@@ -1,1 +1,1 @@
		-base
		+patched
		A orphanchild
		? base
Mads Kiilerich mq: Fix --qrefresh --short to work with --exclude and --include...	r7177	% -- diff shows what is not in patch
Mads Kiilerich mq: Allow qrefresh --silent to take parameters...	r7113	diff
		--- /dev/null
		+++ b/orphanchild
		@@ -0,0 +1,1 @@
		+orphan
Mads Kiilerich mq: Fix --qrefresh --short to work with --exclude and --include...	r7177	% - before starting exclusive tests
		1/base
		2/base
		% - exclude 2/base
		1/base
		% -- status shows 2/base as dirty
		M 2/base
		A orphanchild
		? base
		% - remove 1/base and add 2/base again but not orphanchild
		2/base
		% - add 1/base with include filter - and thus remove 2/base from patch
		1/base

Patrick Mezard mq: fix qrefresh losing copy information (issue 1134)	r6801	% create test repo
		adding a
		% capture changes
		diff --git a/a b/ab
		copy from a
		copy to ab
		--- a/a
		+++ b/ab
		@@ -1,1 +1,2 @@
		a
		+b
		diff --git a/a b/ac
		copy from a
		copy to ac
		--- a/a
		+++ b/ac
		@@ -1,1 +1,2 @@
		a
		+c
		% refresh and check changes again
		diff --git a/a b/ab
		copy from a
		copy to ab
		--- a/a
		+++ b/ab
		@@ -1,1 +1,2 @@
		a
		+b
		diff --git a/a b/ac
		copy from a
		copy to ac
		--- a/a
		+++ b/ac
		@@ -1,1 +1,2 @@
		a
		+c
Patrick Mezard mq: drop copy records when refreshing regular patches (issue1441)...	r7566	% issue1441 without git patches
		diff -r 000000000000 b
		--- /dev/null
		+++ b/b
		@@ -0,0 +1,1 @@
		+a
Patrick Mezard test-mq-qrefresh: test qrefresh when tip != qtip	r10367	% issue2025: qrefresh does not honor filtering options when tip != qtip
		% refresh with tip != qtip
		saving bundle...
		adding branch
		adding changesets
		adding manifests
		adding file changes
		added 1 changesets with 1 changes to 1 files
		% status after refresh
		M a
		% b after refresh
		b
		b
		% patch file after refresh
Steve Losh mq: add parent node IDs to MQ patches on qrefresh/qnew...	r10397	# HG changeset patch
		# Parent

Patrick Mezard test-mq-qrefresh: test qrefresh when tip != qtip	r10367	diff -r 1a60229be7ac b
		--- a/b
		+++ b/b
		@@ -1,1 +1,2 @@
		b
		+b
Patrick Mezard mq: drop copy records when refreshing regular patches (issue1441)...	r7566	% issue1441 with git patches
		diff --git a/b b/b
		new file mode 100644
		--- /dev/null
		+++ b/b
		@@ -0,0 +1,1 @@
		+a

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages