vrajat/git-patch

A git module to manage open source forks

git-patch's Issues

Command to edit a patch

A common requirement is to edit a patch because of a conflict or other errors. The command line should be:
git patch begin-edit --id --branch # To start edit
git patch complete-edit

The script should implement the following workflow:

• Create or checkout dev-branch
• Apply all patches up to patch-id
• Developer makes required changes and commits the changes.
• Developer calls complete-edit
• complete-edit will regenerate and replace the patch.

begin-edit and complete-edit will store any metadata in .patch/cmd_state.yml. Logs will be stored in .patch/edit-<timestamp>.log

Provide a command to create a development branch

For e.g.

git patch create-branch --help
usage: git-patch create-branch [-h] [-n NAME] [-r REMOTE]

optional arguments:
  -h, --help            show this help message and exit
  -n NAME, --name NAME  Name of branch
  -r REMOTE, --remote REMOTE
                        Name of Git Remote

Support combining two patches

Patches can be combined esp. if they belong to the same feature or module. A subsequent patch maybe a bug fix which doesnt have to be maintained separately.

Have support for checkpointing the upstream master

Currently we begin the patching by downloading latest commit from master. Then we manually resolve conflicts in an iterative fashion. In each iteration we expect to resume from the patch we manually fixed last time. This desired behaviour degrades when master has an update at the later point of time and is in conflict with one of the earlier patches. This can repeatedly break in-progress patch work making user go back and forth.

Hack:
To make this more productive, we can have a pre-processing step wherein you cut the upstream master branch at a certain commit and have that serve as a master for the next steps. With this change, we will only move forward while fixing patches and things remain more clear. The downside of-course is that we miss the commits introduced after the cut.

Improve installation and documents

Use gitchangelog to generate changelog

Support classifying commits into sections

Patches can be naturally clubbed together. For e.g. the first patch contains a feature and there are subsequent bugs or feature enhancements. If these commits are classified into sections, then they can be managed together esp. w.r.t skipping or to compact them into a single commit. Provide a couple of functions to manage patches and sections:

• create-section
• move-patch

Support reject strategy to resolve conflicts

Preserve original author name in fixed patch files

After using 'git patch fix-patch' the fixed patch changes author of the fix to the person fixing the patch.
This makes it harder to track down who did what through git blame.

When there are no changes, delete the file from config.yml

Redesign patch edit workflow to fix conflicts

The workflow to fix conflicts is cumbersome. Conflicts are identified by running git patch apply. Then the branch has to be recreated and patches applied. Instead allow developers to edit conflicts when apply command detects conflicts.

patch apply fails with an except AttributeError: 'NoneType' object has no attribute 'rfind'

Traceback (most recent call last):
File "/Users/rajatv/qubole_src/presto_env/bin/git-patch", line 11, in
sys.exit(main())
File "/Users/rajatv/qubole_src/presto_env/lib/python2.6/site-packages/git_patch/git_patch.py", line 290, in main
argument.func(argument, patches)
File "/Users/rajatv/qubole_src/presto_env/lib/python2.6/site-packages/git_patch/git_patch.py", line 135, in patch_apply
section_apply(args, patches)
File "/Users/rajatv/qubole_src/presto_env/lib/python2.6/site-packages/git_patch/git_patch.py", line 167, in section_apply
if commit == os.path.basename(args.patch):
File "/Users/rajatv/qubole_src/presto_env/lib/python2.6/posixpath.py", line 111, in basename
i = p.rfind('/') + 1