FilesExpand file tree

 angular-prototype

/

git-mrb

Copy path

Blame

More file actions

Blame

More file actions

Latest commit

 

History

History

History

executable file

·

80 lines (61 loc) · 2.27 KB

 angular-prototype

/

git-mrb

Copy path

Top

File metadata and controls

• Code
• Blame

executable file

·

80 lines (61 loc) · 2.27 KB

Raw

Copy raw file

Download raw file

Open symbols panel

Edit and raw actions

1

2

3

4

5

6

7

8

9

10

11

12

13

14

15

16

17

18

19

20

21

22

23

24

25

26

27

28

29

30

31

32

33

34

35

36

37

38

39

40

41

42

43

44

45

46

47

48

49

50

51

52

53

54

55

56

57

58

59

60

61

62

63

64

65

66

67

68

69

70

71

72

73

74

75

76

77

78

79

80

#!/usr/bin/env python

"""git-mrb: merge remote branch.

git mrb [remote:branch OR remote-branch] [onto] [upstream]

remote must be locally available, and branch must exist in that remote.

If 'onto' branch isn't given, default is 'master'.

If 'upstream' repository isn't given, default is 'origin'.

You can separate the remote and branch spec with either a : or a -.

"""

#-----------------------------------------------------------------------------

# Imports

#-----------------------------------------------------------------------------

from subprocess import check_call

import sys

#-----------------------------------------------------------------------------

# Functions

#-----------------------------------------------------------------------------

def sh(cmd):

cmd = cmd.format(**shvars)

print '$', cmd

check_call(cmd, shell=True)

#-----------------------------------------------------------------------------

# Main Script

#-----------------------------------------------------------------------------

argv = sys.argv[1:]

narg = len(argv)

try:

branch_spec = argv[0]

sep = ':' if ':' in branch_spec else '-'

remote, branch = branch_spec.split(':', 1)

if not branch:

raise ValueError('Branch spec %s invalid, branch not found' %

branch_spec)

except:

import traceback as tb

tb.print_exc()

print __doc__

sys.exit(1)

onto = argv[1] if narg >= 2 else 'master'

upstream = argv[1] if narg == 3 else 'origin'

# Git doesn't like ':' in branch names.

if sep == ':':

branch_spec = branch_spec.replace(':', '-')

# Global used by sh

shvars = dict(remote=remote, branch_spec=branch_spec, branch=branch,

onto=onto, upstream=upstream)

# Start git calls.

sh('git fetch {remote}')

sh('git checkout -b {branch_spec} {onto}')

sh('git merge {remote}/{branch}')

print """

*************************************************************

Run test suite. If tests pass, run the following to merge:

git checkout {onto}

git merge {branch_spec}

git push {upstream} {onto}

*************************************************************

""".format(**shvars)

ans = raw_input("Revert to master and delete temporary branch? [Y/n]: ")

if ans.strip().lower() in ('', 'y', 'yes'):

sh('git checkout {onto}')

sh('git branch -D {branch_spec}')