upstream/mercurial-mirror Files · rust/hgcli/README.md

merge: store commitinfo if these is a dc or cd conflict...

merge: store commitinfo if these is a dc or cd conflict delete-changed or changed-delete conflicts can either be resolved by mergetool, if some tool is passed and using or by user choose something on prompt or user doing some `hg revert` after choosing the file to remain conflicted. If the user decides to keep the changed side, on commit we just reuse the parent filenode. This is mostly fine unless we are in a distributed environment and people are doing criss-cross merges. Since, we don't have recursive merges or any other way of describing the end result of the merge was an explicit choice and it should be differentiated from it's ancestors, merge algo during criss-cross merges fails to take in account the explicit choice made by user and end up with a what-can-be-said-wrong-merge. The solution which we are trying to fix this is by creating a filenode on commit instead of reusing the parent filenode. This helps differentiate between pre-merged filenode and post-merge filenode and kind of tells about the choice user made. To implement creating new filenode functionality, we store info about these files in mergestate so that we can read them on commit and force create a new filenode. Differential Revision: https://phab.mercurial-scm.org/D8988

Gregory Szorc - - Load All Authors

File last commit:

r45129:bc847878 default


                r46158:4c8a93ec

default

Download file

             README.md
        
                    50 lines
            
             | 2.0 KiB
            
                | text/x-minidsrc
            
             |
                MarkdownLexer
            
             / rust / hgcli / README.md
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Gregory Szorc
    
hgcli: customize for Mercurial...

              r45129
            
      # Oxidized Mercurial

      This project provides a Rust implementation of the Mercurial (`hg`)

      version control tool.

      Under the hood, the project uses

      [PyOxidizer](https://github.com/indygreg/PyOxidizer) to embed a Python

      interpreter in a binary built with Rust. At run-time, the Rust `fn main()`

      is called and Rust code handles initial process startup. An in-process

      Python interpreter is started (if needed) to provide additional

      functionality.

      # Building

      This project currently requires an unreleased version of PyOxidizer

      (0.7.0-pre). For best results, build the exact PyOxidizer commit

      as defined in the `pyoxidizer.bzl` file:

          $ git clone https://github.com/indygreg/PyOxidizer.git

          $ cd PyOxidizer

          $ git checkout <Git commit from pyoxidizer.bzl>

          $ cargo build --release

      Then build this Rust project using the built `pyoxidizer` executable::

          $ /path/to/pyoxidizer/target/release/pyoxidizer build

      If all goes according to plan, there should be an assembled application

      under `build/<arch>/debug/app/` with an `hg` executable:

          $ build/x86_64-unknown-linux-gnu/debug/app/hg version

          Mercurial Distributed SCM (version 5.3.1+433-f99cd77d53dc+20200331)

          (see https://mercurial-scm.org for more information)

          Copyright (C) 2005-2020 Matt Mackall and others

          This is free software; see the source for copying conditions. There is NO

          warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

      # Running Tests

      To run tests with a built `hg` executable, you can use the `--with-hg`

      argument to `run-tests.py`. But there's a wrinkle: many tests run custom

      Python scripts that need to `import` modules provided by Mercurial. Since

      these modules are embedded in the produced `hg` executable, a regular

      Python interpreter can't access them! To work around this, set `PYTHONPATH`

      to the Mercurial source directory. e.g.:

          $ cd /path/to/hg/src/tests

          $ PYTHONPATH=`pwd`/.. python3.7 run-tests.py \

              --with-hg `pwd`/../rust/hgcli/build/x86_64-unknown-linux-gnu/debug/app/hg

	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

Gregory Szorc hgcli: customize for Mercurial...	r45129	# Oxidized Mercurial

		This project provides a Rust implementation of the Mercurial (`hg`)
		version control tool.

		Under the hood, the project uses
		[PyOxidizer](https://github.com/indygreg/PyOxidizer) to embed a Python
		interpreter in a binary built with Rust. At run-time, the Rust `fn main()`
		is called and Rust code handles initial process startup. An in-process
		Python interpreter is started (if needed) to provide additional
		functionality.

		# Building

		This project currently requires an unreleased version of PyOxidizer
		(0.7.0-pre). For best results, build the exact PyOxidizer commit
		as defined in the `pyoxidizer.bzl` file:

		$ git clone https://github.com/indygreg/PyOxidizer.git
		$ cd PyOxidizer
		$ git checkout <Git commit from pyoxidizer.bzl>
		$ cargo build --release

		Then build this Rust project using the built `pyoxidizer` executable::

		$ /path/to/pyoxidizer/target/release/pyoxidizer build

		If all goes according to plan, there should be an assembled application
		under `build/<arch>/debug/app/` with an `hg` executable:

		$ build/x86_64-unknown-linux-gnu/debug/app/hg version
		Mercurial Distributed SCM (version 5.3.1+433-f99cd77d53dc+20200331)
		(see https://mercurial-scm.org for more information)

		Copyright (C) 2005-2020 Matt Mackall and others
		This is free software; see the source for copying conditions. There is NO
		warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

		# Running Tests

		To run tests with a built `hg` executable, you can use the `--with-hg`
		argument to `run-tests.py`. But there's a wrinkle: many tests run custom
		Python scripts that need to `import` modules provided by Mercurial. Since
		these modules are embedded in the produced `hg` executable, a regular
		Python interpreter can't access them! To work around this, set `PYTHONPATH`
		to the Mercurial source directory. e.g.:

		$ cd /path/to/hg/src/tests
		$ PYTHONPATH=`pwd`/.. python3.7 run-tests.py \
		--with-hg `pwd`/../rust/hgcli/build/x86_64-unknown-linux-gnu/debug/app/hg