equal
deleted
inserted
replaced
1009 git=get('git'), |
1009 git=get('git'), |
1010 nodates=get('nodates'), |
1010 nodates=get('nodates'), |
1011 showfunc=get('show_function', 'showfunc'), |
1011 showfunc=get('show_function', 'showfunc'), |
1012 ignorews=get('ignore_all_space', 'ignorews'), |
1012 ignorews=get('ignore_all_space', 'ignorews'), |
1013 ignorewsamount=get('ignore_space_change', 'ignorewsamount'), |
1013 ignorewsamount=get('ignore_space_change', 'ignorewsamount'), |
1014 ignoreblanklines=get('ignore_blank_lines', 'ignoreblanklines')) |
1014 ignoreblanklines=get('ignore_blank_lines', 'ignoreblanklines'), |
|
1015 context=get('unified')) |
1015 |
1016 |
1016 def updatedir(ui, repo, patches): |
1017 def updatedir(ui, repo, patches): |
1017 '''Update dirstate after patch application according to metadata''' |
1018 '''Update dirstate after patch application according to metadata''' |
1018 if not patches: |
1019 if not patches: |
1019 return |
1020 return |