upstream/mercurial-mirror Files · tests/test-diffstat.t

shelve: add a shelve extension to save/restore working changes...

shelve: add a shelve extension to save/restore working changes This extension saves shelved changes using a temporary draft commit, and bundles the temporary commit and its draft ancestors, then strips them. This strategy makes it possible to use Mercurial's bundle and merge machinery to resolve conflicts if necessary when unshelving, even when the destination commit or its ancestors have been amended, squashed, or evolved. (Once a change has been unshelved, its associated unbundled commits are either rolled back or stripped.) Storing the shelved change as a bundle also avoids the difficulty that hidden commits would cause, of making it impossible to amend the parent if it is a draft commits (a common scenario). Although this extension shares its name and some functionality with the third party hgshelve extension, it has little else in common. Notably, the hgshelve extension shelves changes as unified diffs, which makes conflict resolution a matter of finding .rej files and conflict markers, and cleaning up the mess by hand. We do not yet allow hunk-level choosing of changes to record. Compared to the hgshelve extension, this is a small regression in usability, but we hope to integrate that at a later point, once the record machinery becomes more reusable and robust.

Mads Kiilerich - - Load All Authors

File last commit:

r17346:2944a6d3 default


                r19854:49d4919d

default

Download file

             test-diffstat.t
        
                    72 lines
            
             | 1.4 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-diffstat.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init repo

        $ cd repo

        $ i=0; while [ "$i" -lt 213 ]; do echo a >> a; i=`expr $i + 1`; done

        $ hg add a

        $ cp a b

        $ hg add b

      Wide diffstat:

        $ hg diff --stat

         a |  213 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

         b |  213 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

         2 files changed, 426 insertions(+), 0 deletions(-)

      diffstat width:

        $ COLUMNS=24 hg diff --config ui.interactive=true --stat

         a |  213 ++++++++++++++

         b |  213 ++++++++++++++

         2 files changed, 426 insertions(+), 0 deletions(-)

        $ hg ci -m adda

        $ cat >> a <<EOF

        > a

        > a

        > a

        > EOF

      Narrow diffstat:

        $ hg diff --stat

         a |  3 +++

         1 files changed, 3 insertions(+), 0 deletions(-)

        $ hg ci -m appenda

        >>> open("c", "wb").write("\0")

        $ touch d

        $ hg add c d

      Binary diffstat:

        $ hg diff --stat

         c |  Bin 

         1 files changed, 0 insertions(+), 0 deletions(-)

      Binary git diffstat:

        $ hg diff --stat --git

         c |  Bin 

         d |    0 

         2 files changed, 0 insertions(+), 0 deletions(-)

        $ hg ci -m createb

        >>> open("file with spaces", "wb").write("\0")

        $ hg add "file with spaces"

      Filename with spaces diffstat:

        $ hg diff --stat

         file with spaces |  Bin 

         1 files changed, 0 insertions(+), 0 deletions(-)

      Filename with spaces git diffstat:

        $ hg diff --stat --git

         file with spaces |  Bin 

         1 files changed, 0 insertions(+), 0 deletions(-)

        $ cd ..

	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

				$ hg init repo
				$ cd repo
				$ i=0; while [ "$i" -lt 213 ]; do echo a >> a; i=`expr $i + 1`; done
				$ hg add a
				$ cp a b
				$ hg add b

				Wide diffstat:

				$ hg diff --stat
				a \| 213 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
				b \| 213 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
				2 files changed, 426 insertions(+), 0 deletions(-)

				diffstat width:

				$ COLUMNS=24 hg diff --config ui.interactive=true --stat
				a \| 213 ++++++++++++++
				b \| 213 ++++++++++++++
				2 files changed, 426 insertions(+), 0 deletions(-)

				$ hg ci -m adda

				$ cat >> a <<EOF
				> a
				> a
				> a
				> EOF

				Narrow diffstat:

				$ hg diff --stat
				a \| 3 +++
				1 files changed, 3 insertions(+), 0 deletions(-)

				$ hg ci -m appenda

				>>> open("c", "wb").write("\0")
				$ touch d
				$ hg add c d

				Binary diffstat:

				$ hg diff --stat
				c \| Bin
				1 files changed, 0 insertions(+), 0 deletions(-)

				Binary git diffstat:

				$ hg diff --stat --git
				c \| Bin
				d \| 0
				2 files changed, 0 insertions(+), 0 deletions(-)

				$ hg ci -m createb

				>>> open("file with spaces", "wb").write("\0")
				$ hg add "file with spaces"

				Filename with spaces diffstat:

				$ hg diff --stat
				file with spaces \| Bin
				1 files changed, 0 insertions(+), 0 deletions(-)

				Filename with spaces git diffstat:

				$ hg diff --stat --git
				file with spaces \| Bin
				1 files changed, 0 insertions(+), 0 deletions(-)

				$ cd ..