Page MenuHomePhabricator

Fix padding issues on Phriction History
ClosedPublic

Authored by chad on Feb 27 2015, 7:26 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Mar 2, 10:51 AM
Unknown Object (File)
Feb 13 2024, 3:38 AM
Unknown Object (File)
Jan 21 2024, 4:45 PM
Unknown Object (File)
Jan 18 2024, 11:23 AM
Unknown Object (File)
Jan 16 2024, 9:29 PM
Unknown Object (File)
Dec 24 2023, 3:10 AM
Unknown Object (File)
Dec 4 2023, 4:12 AM
Unknown Object (File)
Nov 18 2023, 11:24 PM
Subscribers

Details

Summary

Cleans up the UI a bit, removes excess spacing on ObjectList and adds space around history buttons.

Test Plan

Test a few changes in Phriction. Click on buttons.

Diff Detail

Repository
rP Phabricator
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

chad retitled this revision from to Fix padding issues on Phriction History.
chad updated this object.
chad edited the test plan for this revision. (Show Details)
chad added reviewers: epriestley, btrahan.
epriestley edited edge metadata.
This revision is now accepted and ready to land.Feb 27 2015, 7:26 PM
This revision was automatically updated to reflect the committed changes.

I really need to find a way to stop accidentally working on master

I solved this problem for myself, but I am command line pretty much all the time. So, my command line prompt includes the branch I am on if I am in a git folder.

11:28:28 ~/Dropbox/code/phalanx/src (T7014)

The parenthetical bit at the end is the branch name. Also, the time is teal, the path is yellow, and the branch is blue.

My .bash_profile is something like

source ~/Dropbox/code/bin/.git-prompt.sh

export PS1="\[\033]0;\w\007\]\\e]2;\u@\H\a\033[36m\]\t\[\033[m\] \[\033[33;1m\]\w\[\033[m\]\033[34m\]\$(__git_ps1)\[\033[m\]\n~> "
export PROMPT_COMMAND='echo -ne "\033]0;${PWD/#$HOME/~}\007"'

And git-prompt.sh is here

My messy workaround is to have this alias as gpop ("pop the most recent commit off and throw it away"):

#!/bin/sh

echo "Pop" `git log -n 1 --format='%H %s'`
git reset --hard HEAD^

Then I do:

$ git checkout -b feature # Move my stuff to a feature branch
$ git checkout master # Go back to master
$ gpop # Destroy my stuff on master

You could also do this instead of gpop:

$ git reset --hard origin/master

...but I use gpop often enough elsewhere to keep it around. For example, it's useful if you arc patch --nobranch something and then want to get rid of it.

I will try @btrahan's thing, though I sometimes have multiple Terminals open on different computers.