revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2025-02-03 02:18:24 +01:00
Code Issues Releases Wiki Activity
phorge-phorge/scripts/celerity/install_merge.sh

10 lines
232 B
Bash
Raw Normal View History

Automatically resolve merge conflicts in Celerity map Summary: We can use `.gitattributes` instead but there's no way how to set repository config for all users in Git, right? So provide a script writting to `.git/info/attributes` instead so that we don't have to .gitignore `.gitattributes`. Test Plan: $ scripts/celerity/install_merge.sh $ git pull # with merge conflict in Celerity map Reviewers: epriestley Reviewed By: epriestley CC: aran, Korvin Differential Revision: https://secure.phabricator.com/D3228
2012-08-09 15:44:09 -07:00
#!/bin/sh
Drive all Celerity operations from the new map Summary: Ref T4222. - Removes the old map and changes the CelerityResourceMap API to be entirely driven by the new map. - The new map is about 50% smaller and organized more sensibly. - This removes the `/pkg/` URI component. All resources are now required to have unique names, so we can tell if a resource is a package or not by looking at the name. - Removes some junky old APIs. - Cleans up some other APIs. - Added some feedback for `bin/celerity map`. - `CelerityResourceMap` is still a singleton which is inextricably bound to the Phabricator map; this will change in the future. Test Plan: - Reloaded pages. - Verified packaging works by looking at generated includes. - Forced minification on and verified it worked. - Forced no-timestamps on and verified it worked. - Rebuilt map. - Ran old script and verified error message. - Checked logs. Reviewers: btrahan, hach-que Reviewed By: hach-que CC: chad, aran Maniphest Tasks: T4222 Differential Revision: https://secure.phabricator.com/D7872
2013-12-31 18:04:25 -08:00
echo "resources/celerity/map.php merge=celerity" \
Automatically resolve merge conflicts in Celerity map Summary: We can use `.gitattributes` instead but there's no way how to set repository config for all users in Git, right? So provide a script writting to `.git/info/attributes` instead so that we don't have to .gitignore `.gitattributes`. Test Plan: $ scripts/celerity/install_merge.sh $ git pull # with merge conflict in Celerity map Reviewers: epriestley Reviewed By: epriestley CC: aran, Korvin Differential Revision: https://secure.phabricator.com/D3228
2012-08-09 15:44:09 -07:00
>> `dirname "$0"`/../../.git/info/attributes
git config merge.celerity.name "Celerity Mapper"
git config merge.celerity.driver \
Drive all Celerity operations from the new map Summary: Ref T4222. - Removes the old map and changes the CelerityResourceMap API to be entirely driven by the new map. - The new map is about 50% smaller and organized more sensibly. - This removes the `/pkg/` URI component. All resources are now required to have unique names, so we can tell if a resource is a package or not by looking at the name. - Removes some junky old APIs. - Cleans up some other APIs. - Added some feedback for `bin/celerity map`. - `CelerityResourceMap` is still a singleton which is inextricably bound to the Phabricator map; this will change in the future. Test Plan: - Reloaded pages. - Verified packaging works by looking at generated includes. - Forced minification on and verified it worked. - Forced no-timestamps on and verified it worked. - Rebuilt map. - Ran old script and verified error message. - Checked logs. Reviewers: btrahan, hach-que Reviewed By: hach-que CC: chad, aran Maniphest Tasks: T4222 Differential Revision: https://secure.phabricator.com/D7872
2013-12-31 18:04:25 -08:00
'php $GIT_DIR/../bin/celerity map'
Copy permalink